New folder structure, new zoom levels (tbd), zoom handling

simonebt92 · Jul 2, 2017 · ccc6715 · ccc6715
1 parent 91be43b
commit ccc6715
Show file tree

Hide file tree

Showing 7 changed files with 205 additions and 87 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,4 @@
 .idea/vcs.xml
 .idea/workspace.xml
 node_modules/
+.idea/
diff --git a/example/main.js b/example/main.js
@@ -3,13 +3,13 @@ var markerCluster;
 var cluster;
 var layerManager;
 requirejs(['../libraries/WorldWind/WorldWind',
-        'js/LayerManager', '../MarkerCluster'],
+        'js/LayerManager', '../src/MarkerCluster'],
     function (ww,
               LayerManager, MarkerCluster) {
         "use strict";
 
         WorldWind.Logger.setLoggingLevel(WorldWind.Logger.LEVEL_WARNING);
-        WorldWind.configuration.baseUrl = "../libraries/WorldWind/"
+        WorldWind.configuration.baseUrl = "libraries/WorldWind/"
         wwd = new WorldWind.WorldWindow("canvasOne");
 
         var layers = [
@@ -21,7 +21,7 @@ requirejs(['../libraries/WorldWind/WorldWind',
 
         for (var l = 0; l < layers.length; l++) {
             layers[l].layer.enabled = layers[l].enabled;
-            layers[l].layer.detailControl = 5;
+            layers[l].layer.detailControl = 1;
             wwd.addLayer(layers[l].layer);
         }
 
@@ -48,30 +48,33 @@ requirejs(['../libraries/WorldWind/WorldWind',
         wwd.navigator.lookAtLocation.latitude = 37;
         wwd.navigator.lookAtLocation.longitude = 15;
 
+        for (var x = -90; x < 90; x = x + 1) {
+            for (var y = -90; y < 90; y = y + 1) {
+                var p = markerCluster.newPlacemark([y, x], null, {enabled: false}, {label: x + "_" + y});
+                markerCluster.add(p);
+            }
+        }
+        markerCluster.generateCluster();
+        /*
+         getJSON('example/places.json', function (geojson) {
+
+
+         geojson.features.forEach(function (f) {
+         var coords = f.geometry.coordinates;
+         var p = markerCluster.newPlacemark([coords[0], coords[1]], null, {enabled: false});
+         markerCluster.add(p);
+         });
 
-        getJSON('places.json', function (geojson) {
 
-           // markerCluster.generateJSONCluster(geojson);
-            /*
-             geojson.features.forEach(function (f) {
-             var coords = f.geometry.coordinates;
-             var p = markerCluster.newPlacemark([coords[0], coords[1]], null, {enabled: false});
-             markerCluster.add(p);
-             });
+         }
 
-             markerCluster.generateCluster();
-             });
 
-*/
-             for (var x = -100; x < 100; x++) {
-             for (var y = -90; y < 90; y++) {
-             var p = markerCluster.newPlacemark([x, y], null, {enabled: false},{label:x+"_"+y});
-             markerCluster.add(p);
-             }
-             }
-             markerCluster.generateCluster();
 
-        });
+
+         });
+         */
+
+
         function getJSON(url, callback) {
             var xhr = new XMLHttpRequest();
             xhr.open('GET', url, true);

diff --git a/example/index.html → index.html b/example/index.html → index.html
@@ -10,12 +10,12 @@
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js" type="text/javascript"></script>
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
     <!--<script src="../libraries/supercluster.min.js"></script>-->
-    <script data-main="main" src="https://cdnjs.cloudflare.com/ajax/libs/require.js/2.1.17/require.min.js"></script>
+    <script data-main="example/main" src="https://cdnjs.cloudflare.com/ajax/libs/require.js/2.1.17/require.min.js"></script>
 </head>
 <body>
 <div class="container">
     <div class="jumbotron hidden-xs">
-        <h1 style="text-align:center">World Wind Basic Example</h1>
+        <h1 style="text-align:center">World Wind Cluster Example</h1>
     </div>
     <div class="row">
         <div class="col-sm-3">

diff --git a/supercluster.min.js → libraries/supercluster.min.js b/supercluster.min.js → libraries/supercluster.min.js