licence added

melowntech · Mar 8, 2017 · 5106536 · 5106536
1 parent d5029e0
commit 5106536
Show file tree

Hide file tree

Showing 15 changed files with 31 additions and 36 deletions.
diff --git a/README.md b/README.md
@@ -1,9 +1 @@
-# Melown Core API
-
-## Documentation Links
- * [Melown Core API](https://gitlab.citationtech.net/vts/melown-core-api/wikis/home)
- * [Melown Core API Source Code Structure](https://gitlab.citationtech.net/vts/melown-core-api/wikis/source-code-documentation)
-
-## Sortcuts
- * [Melown Core API Shortcuts](https://gitlab.citationtech.net/vts/melown-core-api/wikis/shortcuts)
-
+# Melown-js
diff --git a/demos/browser/basic/index.html b/demos/browser/basic/index.html
@@ -2,8 +2,8 @@
 <head>
     <title>Vadstena Map Viewer</title>
     <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
-    <link rel="stylesheet" type="text/css" href="../../build/melown-v1.css" />
-    <script type="text/javascript" src="../../build/melown-v1.js"></script>
+    <link rel="stylesheet" type="text/css" href="../../../build/melown-browser.css" />
+    <script type="text/javascript" src="../../../build/melown-browser.js"></script>
     <script type="text/javascript" src="./demo.js"></script>
 </head>
 

diff --git a/demos/browser/flights/index.html b/demos/browser/flights/index.html
@@ -2,8 +2,8 @@
 <head>
     <title>Vadstena Map Viewer</title>
     <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
-    <link rel="stylesheet" type="text/css" href="../../build/melown-v1.css" />
-    <script type="text/javascript" src="../../build/melown-v1.js"></script>
+    <link rel="stylesheet" type="text/css" href="../../../build/melown-browser.css" />
+    <script type="text/javascript" src="../../../build/melown-browser.js"></script>
     <script type="text/javascript" src="./demo.js"></script>
 
 

diff --git a/demos/browser/hit-surface/index.html b/demos/browser/hit-surface/index.html
@@ -2,8 +2,8 @@
 <head>
     <title>Vadstena Map Viewer</title>
     <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
-    <link rel="stylesheet" type="text/css" href="../../build/melown-v1.css" />
-    <script type="text/javascript" src="../../build/melown-v1.js"></script>
+    <link rel="stylesheet" type="text/css" href="../../../build/melown-browser.css" />
+    <script type="text/javascript" src="../../../build/melown-browser.js"></script>
     <script type="text/javascript" src="./demo.js"></script>
 </head>
 

diff --git a/demos/browser/lines-and-images/index.html b/demos/browser/lines-and-images/index.html
@@ -2,8 +2,8 @@
 <head>
     <title>Vadstena Map Viewer</title>
     <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
-    <link rel="stylesheet" type="text/css" href="../../build/melown-v1.css" />
-    <script type="text/javascript" src="../../build/melown-v1.js"></script>
+    <link rel="stylesheet" type="text/css" href="../../../build/melown-browser.css" />
+    <script type="text/javascript" src="../../../build/melown-browser.js"></script>
     <script type="text/javascript" src="./demo.js"></script>
 </head>
 

diff --git a/demos/browser/meshes-hit-test/index.html b/demos/browser/meshes-hit-test/index.html
@@ -2,8 +2,8 @@
 <head>
     <title>Vadstena Map Viewer</title>
     <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
-    <link rel="stylesheet" type="text/css" href="../../build/melown-v1.css" />
-    <script type="text/javascript" src="../../build/melown-v1.js"></script>
+    <link rel="stylesheet" type="text/css" href="../../../build/melown-browser.css" />
+    <script type="text/javascript" src="../../../build/melown-browser.js"></script>
     <script type="text/javascript" src="./demo.js"></script>
 </head>
 

diff --git a/demos/browser/meshes/index.html b/demos/browser/meshes/index.html
@@ -2,8 +2,8 @@
 <head>
     <title>Vadstena Map Viewer</title>
     <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
-    <link rel="stylesheet" type="text/css" href="../../build/melown-v1.css" />
-    <script type="text/javascript" src="../../build/melown-v1.js"></script>
+    <link rel="stylesheet" type="text/css" href="../../../build/melown-browser.css" />
+    <script type="text/javascript" src="../../../build/melown-browser.js"></script>
     <script type="text/javascript" src="./demo.js"></script>
 </head>
 

diff --git a/demos/browser/view-switch/index.html b/demos/browser/view-switch/index.html
@@ -2,8 +2,8 @@
 <head>
     <title>Vadstena Map Viewer</title>
     <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
-    <link rel="stylesheet" type="text/css" href="../../build/melown-v1.css" />
-    <script type="text/javascript" src="../../build/melown-v1.js"></script>
+    <link rel="stylesheet" type="text/css" href="../../../build/melown-browser.css" />
+    <script type="text/javascript" src="../../../build/melown-browser.js"></script>
     <script type="text/javascript" src="./demo.js"></script>
 
 

diff --git a/demos/core/basic/index.html b/demos/core/basic/index.html
@@ -2,8 +2,7 @@
 <head>
     <title>Vadstena Map Viewer</title>
     <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
-
-    <script type="text/javascript" src="../../lib/melown-core-v1-min.js"></script>
+    <script type="text/javascript" src="../../../build/melown-core.js"></script>
     <script type="text/javascript" src="./demo.js"></script>
 </head>
 

diff --git a/demos/core/hit-surface/index.html b/demos/core/hit-surface/index.html
@@ -2,8 +2,7 @@
 <head>
     <title>Vadstena Map Viewer</title>
     <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
-
-    <script type="text/javascript" src="../../lib/melown-core-v1-min.js"></script>
+    <script type="text/javascript" src="../../../build/melown-core.js"></script>
     <script type="text/javascript" src="./demo.js"></script>
 
     <style>

diff --git a/demos/core/lines-and-images/index.html b/demos/core/lines-and-images/index.html
@@ -2,8 +2,7 @@
 <head>
     <title>Vadstena Map Viewer</title>
     <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
-
-    <script type="text/javascript" src="../../lib/melown-core-v1-min.js"></script>
+    <script type="text/javascript" src="../../../build/melown-core.js"></script>
     <script type="text/javascript" src="./demo.js"></script>
 
     <style>

diff --git a/demos/core/meshes-hit-test/index.html b/demos/core/meshes-hit-test/index.html
@@ -2,8 +2,7 @@
 <head>
     <title>Vadstena Map Viewer</title>
     <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
-
-    <script type="text/javascript" src="../../lib/melown-core-v1-min.js"></script>
+    <script type="text/javascript" src="../../../build/melown-core.js"></script>
     <script type="text/javascript" src="./demo.js"></script>
 
     <style>

diff --git a/demos/core/meshes/index.html b/demos/core/meshes/index.html
@@ -2,8 +2,7 @@
 <head>
     <title>Vadstena Map Viewer</title>
     <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
-
-    <script type="text/javascript" src="../../lib/melown-core-v1-min.js"></script>
+    <script type="text/javascript" src="../../../build/melown-core.js"></script>
     <script type="text/javascript" src="./demo.js"></script>
 
     <style>

diff --git a/make.sh b/make.sh
@@ -1,6 +1,9 @@
 CLOSURECOMPILER=../build/tools/closure-compiler/compiler.jar
 
 
+# create lincense header
+echo "/* Melown-js (c) 2011 - 2017 MELOWN TECHNOLOGIES SE */ " > ./build/license-tmp.js
+
 # merge geodata workers
 echo "Melown.MapGeodataProcessorWorker = function() { " | cat - src/core/map/geodata-processor/worker-globals.js src/core/map/geodata-processor/worker-style.js src/core/map/geodata-processor/worker-linestring.js src/core/map/geodata-processor/worker-pointarray.js src/core/map/geodata-processor/worker-polygon.js src/core/map/geodata-processor/worker-text.js src/core/map/geodata-processor/worker-main.js > ./build/geodata-worker-tmp.js
 echo "};">> ./build/geodata-worker-tmp.js 
@@ -83,14 +86,16 @@ cat src/core/utils/matrix.js \
     src/core/update.js > ./build/melown-core-v1-merge-tmp.js
 
 # merge final core lib 
-cat src/core/utils/libs/proj4.js \
+cat ./build/license-tmp.js \
+    src/core/utils/libs/proj4.js \
     src/core/utils/libs/geographics-nomini.js \
     src/core/_nominify.js \
     ./build/melown-core-v1-merge-tmp.js > ./build/melown-core-v1-merge.js
 
 # minify core lib
 # java -jar ${CLOSURECOMPILER} --compilation_level ADVANCED_OPTIMIZATIONS --js _minify.js ../build/melown-core-v1-merge-tmp.js --js_output_file ../build/melown-core-v1-tmp.js
-# cat src/core/utils/libs/proj4.js \
+# cat ./build/license-tmp.js \
+#     src/core/utils/libs/proj4.js \
 #     src/core/utils/libs/geographics-nomini.js \
 #     ./build/melown-core-v1-tmp.js > ./build/melown-core-v1-inspector-mini.js
 # rm ./build/melown-core-v1-tmp.js
@@ -137,7 +142,8 @@ cat ./build/melown-core-v1-merge.js \
 
 #minify lib
 # java -jar compiler/compiler.jar --compilation_level ADVANCED_OPTIMIZATIONS --js melown-core-v1-merge.js ../build/melown-v1-merge.js --js_output_file ../build/melown-v1-tmp.js
-# cat src/core/utils/libs/proj4.js \
+# cat ./build/license-tmp.js \
+#    src/core/utils/libs/proj4.js \
 #    src/core/_nominify.js \
 #    ./build/melown-v1-merge-tmp2.js > ./build/melown-v1-merge.js
 # rm ./build/melown-v1-merge-tmp2.js
@@ -155,6 +161,7 @@ mv ./build/melown-core-v1-merge.js ./build/melown-core.js
 # remove remaining tmps
 rm ./build/geodata-worker-tmp.js 
 rm ./build/melown-core-v1-merge-tmp.js
+rm ./build/license-tmp.js
 
 echo Make complete.
 

diff --git a/src/core/map/subtexture.js b/src/core/map/subtexture.js
@@ -0,0 +1 @@
+// exist in newtextures brunch