egovamap 0.35.39 → 0.35.41

package/egovamap/RingsConvert.js

@@ -1,181 +1,181 @@
-function isNumber(n) {
-    return !isNaN(parseFloat(n)) && isFinite(n);
-}
-
-function ringIsClockwise(ringToTest) {
-    var total = 0,
-        i = 0;
-    var rLength = ringToTest.length;
-    var pt1 = ringToTest[i];
-    var pt2;
-    for (i; i < rLength - 1; i++) {
-        pt2 = ringToTest[i + 1];
-        total += (pt2[0] - pt1[0]) * (pt2[1] + pt1[1]);
-        pt1 = pt2;
-    }
-    return total >= 0;
-}
-
-function closeRing(coordinates) {
-    if (!pointsEqual(coordinates[0], coordinates[coordinates.length - 1])) {
-        coordinates.push(coordinates[0]);
-    }
-    return coordinates;
-}
-
-// checks if 2 x,y points are equal
-function pointsEqual(a, b) {
-    for (var i = 0; i < a.length; i++) {
-        if (a[i] !== b[i]) {
-            return false;
-        }
-    }
-    return true;
-}
-
-function coordinatesContainPoint(coordinates, point) {
-    var contains = false;
-    for (var i = -1, l = coordinates.length, j = l - 1; ++i < l; j = i) {
-        if (
-            ((coordinates[i][1] <= point[1] && point[1] < coordinates[j][1]) ||
-                (coordinates[j][1] <= point[1] &&
-                    point[1] < coordinates[i][1])) &&
-            point[0] <
-                ((coordinates[j][0] - coordinates[i][0]) *
-                    (point[1] - coordinates[i][1])) /
-                    (coordinates[j][1] - coordinates[i][1]) +
-                    coordinates[i][0]
-        ) {
-            contains = !contains;
-        }
-    }
-    return contains;
-}
-
-function edgeIntersectsEdge(a1, a2, b1, b2) {
-    var ua_t =
-        (b2[0] - b1[0]) * (a1[1] - b1[1]) - (b2[1] - b1[1]) * (a1[0] - b1[0]);
-    var ub_t =
-        (a2[0] - a1[0]) * (a1[1] - b1[1]) - (a2[1] - a1[1]) * (a1[0] - b1[0]);
-    var u_b =
-        (b2[1] - b1[1]) * (a2[0] - a1[0]) - (b2[0] - b1[0]) * (a2[1] - a1[1]);
-
-    if (u_b !== 0) {
-        var ua = ua_t / u_b;
-        var ub = ub_t / u_b;
-
-        if (0 <= ua && ua <= 1 && 0 <= ub && ub <= 1) {
-            return true;
-        }
-    }
-
-    return false;
-}
-
-function arraysIntersectArrays(a, b) {
-    if (isNumber(a[0][0])) {
-        if (isNumber(b[0][0])) {
-            for (var i = 0; i < a.length - 1; i++) {
-                for (var j = 0; j < b.length - 1; j++) {
-                    if (edgeIntersectsEdge(a[i], a[i + 1], b[j], b[j + 1])) {
-                        return true;
-                    }
-                }
-            }
-        } else {
-            for (var k = 0; k < b.length; k++) {
-                if (arraysIntersectArrays(a, b[k])) {
-                    return true;
-                }
-            }
-        }
-    } else {
-        for (var l = 0; l < a.length; l++) {
-            if (arraysIntersectArrays(a[l], b)) {
-                return true;
-            }
-        }
-    }
-    return false;
-}
-
-function coordinatesContainCoordinates(outer, inner) {
-    var intersects = arraysIntersectArrays(outer, inner);
-    var contains = coordinatesContainPoint(outer, inner[0]);
-    if (!intersects && contains) {
-        return true;
-    }
-    return false;
-}
-
-function convertRingsToGeoJSON(rings) {
-    var outerRings = [];
-    var holes = [];
-    var x;
-    var outerRing;
-    var hole;
-
-    for (var r = 0; r < rings.length; r++) {
-        var ring = closeRing(rings[r].slice(0));
-        if (ring.length < 4) {
-            continue;
-        }
-
-        if (ringIsClockwise(ring)) {
-            var polygon = [ring.slice().reverse()];
-            outerRings.push(polygon);
-        } else {
-            holes.push(ring.slice().reverse());
-        }
-    }
-
-    var uncontainedHoles = [];
-
-    while (holes.length) {
-        hole = holes.pop();
-        var contained = false;
-        for (x = outerRings.length - 1; x >= 0; x--) {
-            outerRing = outerRings[x][0];
-            if (coordinatesContainCoordinates(outerRing, hole)) {
-                outerRings[x].push(hole);
-                contained = true;
-                break;
-            }
-        }
-
-        if (!contained) {
-            uncontainedHoles.push(hole);
-        }
-    }
-
-    while (uncontainedHoles.length) {
-        hole = uncontainedHoles.pop();
-
-        var intersects = false;
-        for (x = outerRings.length - 1; x >= 0; x--) {
-            outerRing = outerRings[x][0];
-            if (arraysIntersectArrays(outerRing, hole)) {
-                outerRings[x].push(hole);
-                intersects = true;
-                break;
-            }
-        }
-
-        if (!intersects) {
-            outerRings.push([hole.reverse()]);
-        }
-    }
-
-    if (outerRings.length === 1) {
-        return {
-            type: "Polygon",
-            coordinates: outerRings[0],
-        };
-    } else {
-        return {
-            type: "MultiPolygon",
-            coordinates: outerRings,
-        };
-    }
-}
-export default convertRingsToGeoJSON;
+function isNumber(n) {
+    return !isNaN(parseFloat(n)) && isFinite(n);
+}
+
+function ringIsClockwise(ringToTest) {
+    var total = 0,
+        i = 0;
+    var rLength = ringToTest.length;
+    var pt1 = ringToTest[i];
+    var pt2;
+    for (i; i < rLength - 1; i++) {
+        pt2 = ringToTest[i + 1];
+        total += (pt2[0] - pt1[0]) * (pt2[1] + pt1[1]);
+        pt1 = pt2;
+    }
+    return total >= 0;
+}
+
+function closeRing(coordinates) {
+    if (!pointsEqual(coordinates[0], coordinates[coordinates.length - 1])) {
+        coordinates.push(coordinates[0]);
+    }
+    return coordinates;
+}
+
+// checks if 2 x,y points are equal
+function pointsEqual(a, b) {
+    for (var i = 0; i < a.length; i++) {
+        if (a[i] !== b[i]) {
+            return false;
+        }
+    }
+    return true;
+}
+
+function coordinatesContainPoint(coordinates, point) {
+    var contains = false;
+    for (var i = -1, l = coordinates.length, j = l - 1; ++i < l; j = i) {
+        if (
+            ((coordinates[i][1] <= point[1] && point[1] < coordinates[j][1]) ||
+                (coordinates[j][1] <= point[1] &&
+                    point[1] < coordinates[i][1])) &&
+            point[0] <
+                ((coordinates[j][0] - coordinates[i][0]) *
+                    (point[1] - coordinates[i][1])) /
+                    (coordinates[j][1] - coordinates[i][1]) +
+                    coordinates[i][0]
+        ) {
+            contains = !contains;
+        }
+    }
+    return contains;
+}
+
+function edgeIntersectsEdge(a1, a2, b1, b2) {
+    var ua_t =
+        (b2[0] - b1[0]) * (a1[1] - b1[1]) - (b2[1] - b1[1]) * (a1[0] - b1[0]);
+    var ub_t =
+        (a2[0] - a1[0]) * (a1[1] - b1[1]) - (a2[1] - a1[1]) * (a1[0] - b1[0]);
+    var u_b =
+        (b2[1] - b1[1]) * (a2[0] - a1[0]) - (b2[0] - b1[0]) * (a2[1] - a1[1]);
+
+    if (u_b !== 0) {
+        var ua = ua_t / u_b;
+        var ub = ub_t / u_b;
+
+        if (0 <= ua && ua <= 1 && 0 <= ub && ub <= 1) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+function arraysIntersectArrays(a, b) {
+    if (isNumber(a[0][0])) {
+        if (isNumber(b[0][0])) {
+            for (var i = 0; i < a.length - 1; i++) {
+                for (var j = 0; j < b.length - 1; j++) {
+                    if (edgeIntersectsEdge(a[i], a[i + 1], b[j], b[j + 1])) {
+                        return true;
+                    }
+                }
+            }
+        } else {
+            for (var k = 0; k < b.length; k++) {
+                if (arraysIntersectArrays(a, b[k])) {
+                    return true;
+                }
+            }
+        }
+    } else {
+        for (var l = 0; l < a.length; l++) {
+            if (arraysIntersectArrays(a[l], b)) {
+                return true;
+            }
+        }
+    }
+    return false;
+}
+
+function coordinatesContainCoordinates(outer, inner) {
+    var intersects = arraysIntersectArrays(outer, inner);
+    var contains = coordinatesContainPoint(outer, inner[0]);
+    if (!intersects && contains) {
+        return true;
+    }
+    return false;
+}
+
+function convertRingsToGeoJSON(rings) {
+    var outerRings = [];
+    var holes = [];
+    var x;
+    var outerRing;
+    var hole;
+
+    for (var r = 0; r < rings.length; r++) {
+        var ring = closeRing(rings[r].slice(0));
+        if (ring.length < 4) {
+            continue;
+        }
+
+        if (ringIsClockwise(ring)) {
+            var polygon = [ring.slice().reverse()];
+            outerRings.push(polygon);
+        } else {
+            holes.push(ring.slice().reverse());
+        }
+    }
+
+    var uncontainedHoles = [];
+
+    while (holes.length) {
+        hole = holes.pop();
+        var contained = false;
+        for (x = outerRings.length - 1; x >= 0; x--) {
+            outerRing = outerRings[x][0];
+            if (coordinatesContainCoordinates(outerRing, hole)) {
+                outerRings[x].push(hole);
+                contained = true;
+                break;
+            }
+        }
+
+        if (!contained) {
+            uncontainedHoles.push(hole);
+        }
+    }
+
+    while (uncontainedHoles.length) {
+        hole = uncontainedHoles.pop();
+
+        var intersects = false;
+        for (x = outerRings.length - 1; x >= 0; x--) {
+            outerRing = outerRings[x][0];
+            if (arraysIntersectArrays(outerRing, hole)) {
+                outerRings[x].push(hole);
+                intersects = true;
+                break;
+            }
+        }
+
+        if (!intersects) {
+            outerRings.push([hole.reverse()]);
+        }
+    }
+
+    if (outerRings.length === 1) {
+        return {
+            type: "Polygon",
+            coordinates: outerRings[0],
+        };
+    } else {
+        return {
+            type: "MultiPolygon",
+            coordinates: outerRings,
+        };
+    }
+}
+export default convertRingsToGeoJSON;

package/egovamap/coordconvert/CoordConvConfig.js

@@ -1,7 +1,7 @@
-var CoordConvConfig = {
-    coordConvert4Params:
-        "-47363.969#-4112623.75#0.0039286694040273984#1.0000046699602922#0#116.0",
-    coordConvert4ParamsReverse:
-        "31175.966131687164#4112791.5852928162#-0.003850255399136165#1.0000100832629242#0#116.0",
-};
-export default CoordConvConfig;
+var CoordConvConfig = {
+    coordConvert4Params:
+        "-47363.969#-4112623.75#0.0039286694040273984#1.0000046699602922#0#116.0",
+    coordConvert4ParamsReverse:
+        "31175.966131687164#4112791.5852928162#-0.003850255399136165#1.0000100832629242#0#116.0",
+};
+export default CoordConvConfig;

package/egovamap/egovaBI.js

@@ -134,7 +134,7 @@ var egovaBI = function (globeMap, gisMap, mapType) {
       p.minZoom = options.common.beginLevel;
       p.maxZoom = options.common.endLevel;
       p.symbolType = -1;
-      p.symbolUrl = options.textStyle.symbolUrl || "location.png";
+      p.symbolUrl = p.symbolUrl || options.textStyle.symbolUrl || "location.png";
       if (options.selected && options.selected.hSymbolUrl)
         p.hSymbolUrl = options.selected.hSymbolUrl;
       p.scale = options.textStyle.scale;

package/egovamap/egovagisviewer.js

@@ -2896,6 +2896,15 @@ var EGovaGISMap = function (
     that.identifyV22 = function( options) {
         return that.callMap("identifyV22", options);
     }
+
+    that.showGeoserverVTLayer = function(id, options) {
+        return that.callMap("showGeoserverVTLayer", id, options);
+    }
+
+    that.setGeoserverVTLayer = function(id, options) {
+        return that.callMap("setGeoserverVTLayer", id, options);
+    }
+
     that.init();
 };
 

package/egovamap/egovamap.css

@@ -1,97 +1,97 @@
-@import url(./mapswich.css);
-
-.fullWindow {
-    position: absolute;
-    top: 0;
-    left: 0;
-    height: 100%;
-    width: 100%;
-    margin: 0;
-    overflow: hidden;
-    padding: 0;
-    font-family: sans-serif;
-}
-
-.desktop-map {
-    width: 100%;
-    height: 100%;
-    overflow: hidden;
-    margin: 0;
-    z-index: 0;
-}
-
-.maps-container {
-    overflow: hidden;
-    margin: 0;
-    z-index: 0;
-}
-
-.emap-container {
-    position: absolute;
-    right: 0;
-    bottom: 0;
-    width: 100%;
-    height: 100%;
-    overflow: hidden;
-    margin: 0;
-}
-
-.emap-iframe {
-    width: 100%;
-    height: 100%;
-    overflow: hidden;
-    margin: 0;
-    z-index: 0;
-    frameborder: 0;
-    border: 0;
-    marginwidth: 0;
-    marginheight: 0;
-}
-
-.mmsmap-container {
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    width: 100%;
-    overflow: hidden;
-    margin: 0;
-    z-index: 0;
-    transition: height 0.5s;
-    transition-timing-function: linear;
-    display: none;
-}
-
-.mmsmap-iframe {
-    width: 100%;
-    height: 100%;
-    overflow: hidden;
-    margin: 0;
-    z-index: 0;
-    frameborder: 0;
-    border: 0;
-    marginwidth: 0;
-    marginheight: 0;
-}
-
-.globemap-container {
-    position: absolute;
-    right: 0;
-    bottom: 0;
-    width: 100%;
-    height: 100%;
-    overflow: hidden;
-    margin: 0;
-    z-index: 0;
-}
-
-.globemap-iframe {
-    width: 100%;
-    height: 100%;
-    overflow: hidden;
-    margin: 0;
-    z-index: 0;
-    frameborder: 0;
-    border: 0;
-    marginwidth: 0;
-    marginheight: 0;
-}
+@import url(./mapswich.css);
+
+.fullWindow {
+    position: absolute;
+    top: 0;
+    left: 0;
+    height: 100%;
+    width: 100%;
+    margin: 0;
+    overflow: hidden;
+    padding: 0;
+    font-family: sans-serif;
+}
+
+.desktop-map {
+    width: 100%;
+    height: 100%;
+    overflow: hidden;
+    margin: 0;
+    z-index: 0;
+}
+
+.maps-container {
+    overflow: hidden;
+    margin: 0;
+    z-index: 0;
+}
+
+.emap-container {
+    position: absolute;
+    right: 0;
+    bottom: 0;
+    width: 100%;
+    height: 100%;
+    overflow: hidden;
+    margin: 0;
+}
+
+.emap-iframe {
+    width: 100%;
+    height: 100%;
+    overflow: hidden;
+    margin: 0;
+    z-index: 0;
+    frameborder: 0;
+    border: 0;
+    marginwidth: 0;
+    marginheight: 0;
+}
+
+.mmsmap-container {
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    width: 100%;
+    overflow: hidden;
+    margin: 0;
+    z-index: 0;
+    transition: height 0.5s;
+    transition-timing-function: linear;
+    display: none;
+}
+
+.mmsmap-iframe {
+    width: 100%;
+    height: 100%;
+    overflow: hidden;
+    margin: 0;
+    z-index: 0;
+    frameborder: 0;
+    border: 0;
+    marginwidth: 0;
+    marginheight: 0;
+}
+
+.globemap-container {
+    position: absolute;
+    right: 0;
+    bottom: 0;
+    width: 100%;
+    height: 100%;
+    overflow: hidden;
+    margin: 0;
+    z-index: 0;
+}
+
+.globemap-iframe {
+    width: 100%;
+    height: 100%;
+    overflow: hidden;
+    margin: 0;
+    z-index: 0;
+    frameborder: 0;
+    border: 0;
+    marginwidth: 0;
+    marginheight: 0;
+}

package/egovamap/egovamap.js

@@ -5694,6 +5694,20 @@ var EGovaMap = function (
         }
     };
 
+    that.showGeoserverVTLayer = function (id, options) {
+        if (scene == null) return;
+        if (gisMap != null) {
+            gisMap.showGeoserverVTLayer.apply(this, arguments);
+        }
+    };
+
+    that.setGeoserverVTLayer = function (id, options) {
+        if (scene == null) return;
+        if (gisMap != null) {
+            gisMap.setGeoserverVTLayer.apply(this, arguments);
+        }
+    };
+
     that.initMap(containerID, callback, mapType, mapConfig, mapParam);
 
     // EGovaBI(globeMap).bind(this)();