许可变更

codingmiao · May 11, 2022 · effd7b9 · effd7b9
1 parent 1b8fed2
commit effd7b9
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 51 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,35 +1,21 @@
+----------------------------------------------------------------------------------------- 主体部分
 注意:
+本协议分为”主体部分“、”Apache-2.0部分“、”AGPL-3.0部分“。
 
-出于行业竞争力保护目的，本软件针对不同行业使用不同的开源协议:
+无论以任何形式的传递（包含但不限于购买、分发、二次开发、服务调用），本软件的许可协议均不得在传递过程中发生改变。
 
-当本软件应用于能源行业(煤炭、电力、新能源)时，本软件使用的开源协议为 AGPL-3.0 license；
+出于行业竞争力保护目的，不同行业在使用本软件时需要遵循以下规则:
 
-当本软件应用于非能源行业时(即非煤炭、电力、新能源行业)时，本软件使用的开源协议为 Apache-2.0 license；
+当本软件应用于能源行业(煤炭、电力、新能源)时，您需要遵守”主体部分“、”AGPL-3.0部分“的协议约束；
 
-但是，如果您与giscat达成另一项商业许可协议并收到来自[email protected]的商业许可文件，
-将允许您使用商业许可文件中所述的许可来取代 AGPL-3.0 / Apache-2.0 license 带来的限制。
-
-
-
-NOTICE:
-
-For the purpose of industry competition protection,
-the software uses different open source protocols for different industries:
-
-When the software is applied to the energy industry (coal, electric power, new energy),
-the open source agreement of the software is AGPL-3.0 license;
-
-When the software is applied to non-energy industries (that is, non-coal, electric power, and new energy industries),
-the open source agreement used by the software is apache-2.0 license;
-
-However, if you enter into another commercial licensing agreement with giscat,
-and received commercial license file from [email protected],
-this software allows you to replace the restrictions imposed by the AGPL-3.0 / Apache-2.0 license
-with the licenses described in the commercial license file.
+当本软件应用于非能源行业时(即非煤炭、电力、新能源行业)时，您需要遵守”主体部分“、”Apache-2.0部分“的协议约束；
 
+但是，如果您与giscat达成另一项商业许可协议并收到来自[email protected]的商业许可文件，
+，在商业许可文件允许的使用范围内，将允许您使用商业许可文件中所述的许可来替代 ”Apache-2.0部分“、”AGPL-3.0部分“ 带来的限制。
 
+----------------------------------------------------------------------------------------- end 主体部分
 
------------------------------------------------------------------------------------------
+----------------------------------------------------------------------------------------- Apache-2.0部分
 
                                  Apache License
                            Version 2.0, January 2004
@@ -233,7 +219,9 @@ with the licenses described in the commercial license file.
    See the License for the specific language governing permissions and
    limitations under the License.
 
------------------------------------------------------------------------------------------
+----------------------------------------------------------------------------------------- end Apache-2.0部分
+
+----------------------------------------------------------------------------------------- AGPL-3.0部分
 
                     GNU AFFERO GENERAL PUBLIC LICENSE
                        Version 3, 19 November 2007
@@ -896,3 +884,5 @@ specific requirements.
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU AGPL, see
 <http://www.gnu.org/licenses/>.
+
+----------------------------------------------------------------------------------------- end AGPL-3.0部分
diff --git a/README.md b/README.md
@@ -11,41 +11,24 @@ giscat是一套简洁、快速的java gis工具集，包含如下工具：
 [pojo详细说明与示例](giscat-vector/giscat-vector-pojo)
 
 [ProtoFeature规范](giscat-vector/giscat-vector-pojo/src/main/resources/ProtoFeature.proto)
-# 栅格
-
-
 
 
+## util
+一系列处理矢量数据的工具，包含坐标转换、图形分析裁剪等
+详见[测试用例](giscat-vector/giscat-vector-util/src/test/java)
 
+## mvt 
+矢量瓦片生成与解析工具
+[基于springboot编写矢量瓦片服务示例](https://blog.wowtools.org/2022/04/28/2022-04-28-mapbox-gl-tutorial-8/)
 
+# 栅格
 
 
-# license
-注意:
-
-出于行业竞争力保护目的，本软件针对不同行业使用不同的开源协议:
-
-当本软件应用于能源行业(煤炭、电力、新能源)时，本软件使用的开源协议为 AGPL-3.0 license；
-
-当本软件应用于非能源行业时(即非煤炭、电力、新能源行业)时，本软件使用的开源协议为 Apache-2.0 license；
-
-但是，如果您与giscat达成另一项商业许可协议并收到来自[email protected]的商业许可文件，
-将允许您使用商业许可文件中所述的许可来取代 AGPL-3.0 / Apache-2.0 license 带来的限制。
-
 
 
-NOTICE:
 
-For the purpose of industry competition protection,
-the software uses different open source protocols for different industries:
 
-When the software is applied to the energy industry (coal, electric power, new energy),
-the open source agreement of the software is AGPL-3.0 license;
 
-When the software is applied to non-energy industries (that is, non-coal, electric power, and new energy industries),
-the open source agreement used by the software is apache-2.0 license;
 
-However, if you enter into another commercial licensing agreement with giscat,
-and received commercial license file from [email protected],
-this software allows you to replace the restrictions imposed by the AGPL-3.0 / Apache-2.0 license
-with the licenses described in the commercial license file.
+# license
+本软件采用自定义协议，请阅读[LICENSE文件](https://github.com/codingmiao/giscat/blob/main/LICENSE)