mars2d-esri 3.1.18 → 3.1.19

package/dist/mars2d-esri.js

@@ -1,8 +1,8 @@
 /**
  * Mars2D平台插件,ArcGIS Server功能支持插件  mars2d-esri
  *
- * 版本信息：v3.1.18
- * 编译日期：2023-07-24 15:15:03
+ * 版本信息：v3.1.19
+ * 编译日期：2023-08-22 12:46:23
  * 版权所有：Copyright by 火星科技  http://mars2d.cn
  * 使用单位：免费公开版 ，2021-10-01
  */
@@ -37,48 +37,50 @@
 
   var name = "esri-leaflet";
   var description = "Leaflet plugins for consuming ArcGIS Online and ArcGIS Server services.";
-  var version$1 = "3.0.7";
+  var version$1 = "3.0.11";
   var author = "Patrick Arlt <parlt@esri.com> (http://patrickarlt.com)";
   var bugs = {
   	url: "https://github.com/esri/esri-leaflet/issues"
   };
   var contributors = [
   	"Patrick Arlt <parlt@esri.com> (http://patrickarlt.com)",
-  	"John Gravois <jgravois@esri.com> (https://johngravois.com)",
+  	"John Gravois (https://johngravois.com)",
   	"Gavin Rehkemper <grehkemper@esri.com> (https://gavinr.com)",
-  	"Jacob Wasilkowski <jwasilkowski@esri.com> (https://jwasilgeo.github.io)"
+  	"Jacob Wasilkowski (https://jwasilgeo.github.io)"
   ];
   var dependencies = {
   	"@terraformer/arcgis": "^2.1.0",
   	"tiny-binary-search": "^1.0.3"
   };
   var devDependencies = {
-  	"@rollup/plugin-json": "^4.1.0",
-  	"@rollup/plugin-node-resolve": "^13.1.3",
-  	chai: "4.3.6",
-  	"gh-release": "^6.0.1",
-  	"highlight.js": "^11.4.0",
-  	"http-server": "^14.1.0",
+  	"@rollup/plugin-json": "^6.0.0",
+  	"@rollup/plugin-node-resolve": "^15.0.1",
+  	"@rollup/plugin-terser": "^0.3.0",
+  	chai: "4.3.7",
+  	"chokidar-cli": "^3.0.0",
+  	"gh-release": "^7.0.1",
+  	"highlight.js": "^11.7.0",
+  	"http-server": "^14.1.1",
   	husky: "^1.1.1",
-  	karma: "^6.3.16",
-  	"karma-chai-sinon": "^0.1.5",
-  	"karma-chrome-launcher": "^3.1.0",
+  	karma: "^6.4.1",
+  	"karma-chrome-launcher": "^3.1.1",
   	"karma-coverage": "^2.2.0",
+  	"karma-edgium-launcher": "github:matracey/karma-edgium-launcher",
+  	"karma-firefox-launcher": "^2.1.2",
   	"karma-mocha": "^2.0.1",
   	"karma-mocha-reporter": "^2.2.5",
+  	"karma-safari-launcher": "~1.0.0",
+  	"karma-sinon-chai": "^2.0.2",
   	"karma-sourcemap-loader": "^0.3.8",
   	leaflet: "^1.6.0",
   	mkdirp: "^1.0.4",
-  	mocha: "^9.2.0",
+  	mocha: "^10.2.0",
   	"npm-run-all": "^4.1.5",
-  	rollup: "^2.67.2",
-  	"rollup-plugin-terser": "^7.0.2",
-  	semistandard: "^9.0.0",
-  	sinon: "^13.0.1",
+  	rollup: "^2.79.1",
+  	semistandard: "^14.2.3",
+  	sinon: "^15.0.1",
   	"sinon-chai": "3.7.0",
-  	snazzy: "^9.0.0",
-  	"uglify-js": "^3.15.1",
-  	watch: "^1.0.2"
+  	snazzy: "^9.0.0"
   };
   var files = [
   	"src/**/*.js",
@@ -88,7 +90,7 @@
   	"dist/siteData.json",
   	"profiles/*.js"
   ];
-  var homepage = "http://esri.github.io/esri-leaflet";
+  var homepage = "https://developers.arcgis.com/esri-leaflet/";
   var module = "src/EsriLeaflet.js";
   var jspm = {
   	registry: "npm",
@@ -121,11 +123,10 @@
   	precommit: "npm run lint",
   	fix: "semistandard --fix",
   	release: "./scripts/release.sh",
-  	"start-watch": "watch \"npm run build\" src",
+  	"start-watch": "chokidar src -c \"npm run build\"",
   	start: "run-p start-watch serve",
   	serve: "http-server -p 5000 -c-1 -o",
-  	test: "npm run lint && karma start",
-  	"test:ci": "npm run lint && karma start --browsers Chrome_travis_ci"
+  	test: "npm run lint && karma start"
   };
   var semistandard = {
   	globals: [
@@ -183,7 +184,7 @@
     params.f = params.f || 'json';
 
     for (var key in params) {
-      if (params.hasOwnProperty(key)) {
+      if (Object.prototype.hasOwnProperty.call(params, key)) {
         var param = params[key];
         var type = Object.prototype.toString.call(param);
         var value;
@@ -325,7 +326,7 @@
 
     // request is longer then 2000 characters and the browser does not support CORS, log a warning
     } else {
-      warn('a request to ' + url + ' was longer then 2000 characters and this browser cannot make a cross-domain post request. Please use a proxy http://esri.github.io/esri-leaflet/api-reference/request.html');
+      warn('a request to ' + url + ' was longer then 2000 characters and this browser cannot make a cross-domain post request. Please use a proxy https://developers.arcgis.com/esri-leaflet/api-reference/request/');
       return;
     }
 
@@ -414,9 +415,9 @@
   };
 
   /* @preserve
-  * @terraformer/arcgis - v2.0.7 - MIT
-  * Copyright (c) 2012-2021 Environmental Systems Research Institute, Inc.
-  * Thu Jul 22 2021 13:58:30 GMT-0700 (Pacific Daylight Time)
+  * @terraformer/arcgis - v2.1.1 - MIT
+  * Copyright (c) 2012-2022 Environmental Systems Research Institute, Inc.
+  * Tue Aug 02 2022 14:23:48 GMT-0700 (Pacific Daylight Time)
   */
   /* Copyright (c) 2012-2019 Environmental Systems Research Institute, Inc.
    * Apache-2.0 */
@@ -765,7 +766,7 @@
         result.x = geojson.coordinates[0];
         result.y = geojson.coordinates[1];
 
-        if (geojson.coordinates[2]) {
+        if (geojson.coordinates[2] != null) {
           result.z = geojson.coordinates[2];
         }
 
@@ -775,7 +776,7 @@
       case 'MultiPoint':
         result.points = geojson.coordinates.slice(0);
 
-        if (geojson.coordinates[0][2]) {
+        if (geojson.coordinates[0][2] != null) {
           result.hasZ = true;
         }
 
@@ -785,7 +786,7 @@
       case 'LineString':
         result.paths = [geojson.coordinates.slice(0)];
 
-        if (geojson.coordinates[0][2]) {
+        if (geojson.coordinates[0][2] != null) {
           result.hasZ = true;
         }
 
@@ -795,7 +796,7 @@
       case 'MultiLineString':
         result.paths = geojson.coordinates.slice(0);
 
-        if (geojson.coordinates[0][0][2]) {
+        if (geojson.coordinates[0][0][2] != null) {
           result.hasZ = true;
         }
 
@@ -805,7 +806,7 @@
       case 'Polygon':
         result.rings = orientRings(geojson.coordinates.slice(0));
 
-        if (geojson.coordinates[0][0][2]) {
+        if (geojson.coordinates[0][0][2] != null) {
           result.hasZ = true;
         }
 
@@ -815,7 +816,7 @@
       case 'MultiPolygon':
         result.rings = flattenMultiPolygonRings(geojson.coordinates.slice(0));
 
-        if (geojson.coordinates[0][0][0][2]) {
+        if (geojson.coordinates[0][0][0][2] != null) {
           result.hasZ = true;
         }
 
@@ -857,7 +858,6 @@
     return result;
   };
 
-  var BASE_LEAFLET_ATTRIBUTION_STRING = '<a href="http://leafletjs.com" title="A JS library for interactive maps">Leaflet</a>';
   var POWERED_BY_ESRI_ATTRIBUTION_STRING = 'Powered by <a href="https://www.esri.com">Esri</a>';
 
   function geojsonToArcGIS (geojson, idAttr) {
@@ -884,12 +884,12 @@
   function boundsToExtent (bounds) {
     bounds = L.latLngBounds(bounds);
     return {
-      'xmin': bounds.getSouthWest().lng,
-      'ymin': bounds.getSouthWest().lat,
-      'xmax': bounds.getNorthEast().lng,
-      'ymax': bounds.getNorthEast().lat,
-      'spatialReference': {
-        'wkid': 4326
+      xmin: bounds.getSouthWest().lng,
+      ymin: bounds.getSouthWest().lat,
+      xmax: bounds.getNorthEast().lng,
+      ymax: bounds.getNorthEast().lat,
+      spatialReference: {
+        wkid: 4326
       }
     };
   }
@@ -959,7 +959,7 @@
     return featureCollection;
   }
 
-    // trim url whitespace and add a trailing slash if needed
+  // trim url whitespace and add a trailing slash if needed
   function cleanUrl (url) {
     // trim leading and trailing spaces, but not spaces inside the url
     url = L.Util.trim(url);
@@ -1066,7 +1066,6 @@
         map.attributionControl._esriAttributionAddedOnce = true;
       }
 
-      map.attributionControl.setPrefix(BASE_LEAFLET_ATTRIBUTION_STRING + ' | ' + POWERED_BY_ESRI_ATTRIBUTION_STRING);
       L.DomUtil.addClass(map.attributionControl._container, 'esri-truncated-attribution:hover');
       L.DomUtil.addClass(map.attributionControl._container, 'esri-truncated-attribution');
     }
@@ -1082,7 +1081,6 @@
 
     // Only remove the attribution if we're about to remove the LAST esri-leaflet layer (_esriAttributionLayerCount)
     if (map.attributionControl._esriAttributionLayerCount && map.attributionControl._esriAttributionLayerCount === 1) {
-      map.attributionControl.setPrefix(BASE_LEAFLET_ATTRIBUTION_STRING);
       L.DomUtil.removeClass(map.attributionControl._container, 'esri-truncated-attribution:hover');
       L.DomUtil.removeClass(map.attributionControl._container, 'esri-truncated-attribution');
     }
@@ -1144,8 +1142,6 @@
 
     // warn the user if we havn't found an appropriate object
     warn('invalid geometry passed to spatial query. Should be L.LatLng, L.LatLngBounds, L.Marker or a GeoJSON Point, Line, Polygon or MultiPolygon object');
-
-    return;
   }
 
   function _getAttributionData (url, map) {
@@ -1207,7 +1203,7 @@
         }
       }
 
-      newAttributions = newAttributions.substr(2);
+      newAttributions = POWERED_BY_ESRI_ATTRIBUTION_STRING + ' | ' + newAttributions.substr(2);
       attributionElement.innerHTML = newAttributions;
       attributionElement.style.maxWidth = calcAttributionWidth(map);
 
@@ -1323,15 +1319,15 @@
 
   var Query = Task.extend({
     setters: {
-      'offset': 'resultOffset',
-      'limit': 'resultRecordCount',
-      'fields': 'outFields',
-      'precision': 'geometryPrecision',
-      'featureIds': 'objectIds',
-      'returnGeometry': 'returnGeometry',
-      'returnM': 'returnM',
-      'transform': 'datumTransformation',
-      'token': 'token'
+      offset: 'resultOffset',
+      limit: 'resultRecordCount',
+      fields: 'outFields',
+      precision: 'geometryPrecision',
+      featureIds: 'objectIds',
+      returnGeometry: 'returnGeometry',
+      returnM: 'returnM',
+      transform: 'datumTransformation',
+      token: 'token'
     },
 
     path: 'query',
@@ -1538,22 +1534,22 @@
   var Find = Task.extend({
     setters: {
       // method name > param name
-      'contains': 'contains',
-      'text': 'searchText',
-      'fields': 'searchFields', // denote an array or single string
-      'spatialReference': 'sr',
-      'sr': 'sr',
-      'layers': 'layers',
-      'returnGeometry': 'returnGeometry',
-      'maxAllowableOffset': 'maxAllowableOffset',
-      'precision': 'geometryPrecision',
-      'dynamicLayers': 'dynamicLayers',
-      'returnZ': 'returnZ',
-      'returnM': 'returnM',
-      'gdbVersion': 'gdbVersion',
+      contains: 'contains',
+      text: 'searchText',
+      fields: 'searchFields', // denote an array or single string
+      spatialReference: 'sr',
+      sr: 'sr',
+      layers: 'layers',
+      returnGeometry: 'returnGeometry',
+      maxAllowableOffset: 'maxAllowableOffset',
+      precision: 'geometryPrecision',
+      dynamicLayers: 'dynamicLayers',
+      returnZ: 'returnZ',
+      returnM: 'returnM',
+      gdbVersion: 'gdbVersion',
       // skipped implementing this (for now) because the REST service implementation isnt consistent between operations
       // 'transform': 'datumTransformations',
-      'token': 'token'
+      token: 'token'
     },
 
     path: 'find',
@@ -1604,12 +1600,12 @@
 
   var IdentifyFeatures = Identify.extend({
     setters: {
-      'layers': 'layers',
-      'precision': 'geometryPrecision',
-      'tolerance': 'tolerance',
+      layers: 'layers',
+      precision: 'geometryPrecision',
+      tolerance: 'tolerance',
       // skipped implementing this (for now) because the REST service implementation isnt consistent between operations.
       // 'transform': 'datumTransformations'
-      'returnGeometry': 'returnGeometry'
+      returnGeometry: 'returnGeometry'
     },
 
     params: {
@@ -1653,7 +1649,6 @@
         // immediately invoke with an error
         if (error) {
           callback.call(context, error, undefined, response);
-          return;
 
         // ok no error lets just assume we have features...
         } else {
@@ -1681,11 +1676,11 @@
 
   var IdentifyImage = Identify.extend({
     setters: {
-      'setMosaicRule': 'mosaicRule',
-      'setRenderingRule': 'renderingRule',
-      'setPixelSize': 'pixelSize',
-      'returnCatalogItems': 'returnCatalogItems',
-      'returnGeometry': 'returnGeometry'
+      setMosaicRule: 'mosaicRule',
+      setRenderingRule: 'renderingRule',
+      setPixelSize: 'pixelSize',
+      returnCatalogItems: 'returnCatalogItems',
+      returnGeometry: 'returnGeometry'
     },
 
     params: {
@@ -1731,24 +1726,24 @@
       var catalogItems = response.catalogItems;
       var catalogItemVisibilities = response.catalogItemVisibilities;
       var geoJSON = {
-        'pixel': {
-          'type': 'Feature',
-          'geometry': {
-            'type': 'Point',
-            'coordinates': [location.x, location.y]
+        pixel: {
+          type: 'Feature',
+          geometry: {
+            type: 'Point',
+            coordinates: [location.x, location.y]
           },
-          'crs': {
-            'type': 'EPSG',
-            'properties': {
-              'code': location.spatialReference.wkid
+          crs: {
+            type: 'EPSG',
+            properties: {
+              code: location.spatialReference.wkid
             }
           },
-          'properties': {
-            'OBJECTID': response.objectId,
-            'name': response.name,
-            'value': response.value
+          properties: {
+            OBJECTID: response.objectId,
+            name: response.name,
+            value: response.value
           },
-          'id': response.objectId
+          id: response.objectId
         }
       };
 
@@ -1837,7 +1832,6 @@
       }
       if (this._authenticating) {
         this._requestQueue.push([method, path, params, callback, context]);
-        return;
       } else {
         var url = (this.options.proxy) ? this.options.proxy + '?' + this.options.url + path : this.options.url + path;
 
@@ -2303,30 +2297,30 @@
 
     statics: {
       MercatorZoomLevels: {
-        '0': 156543.03392799999,
-        '1': 78271.516963999893,
-        '2': 39135.758482000099,
-        '3': 19567.879240999901,
-        '4': 9783.9396204999593,
-        '5': 4891.9698102499797,
-        '6': 2445.9849051249898,
-        '7': 1222.9924525624899,
-        '8': 611.49622628138002,
-        '9': 305.74811314055802,
-        '10': 152.874056570411,
-        '11': 76.437028285073197,
-        '12': 38.218514142536598,
-        '13': 19.109257071268299,
-        '14': 9.5546285356341496,
-        '15': 4.7773142679493699,
-        '16': 2.38865713397468,
-        '17': 1.1943285668550501,
-        '18': 0.59716428355981699,
-        '19': 0.29858214164761698,
-        '20': 0.14929107082381,
-        '21': 0.07464553541191,
-        '22': 0.0373227677059525,
-        '23': 0.0186613838529763
+        0: 156543.03392799999,
+        1: 78271.516963999893,
+        2: 39135.758482000099,
+        3: 19567.879240999901,
+        4: 9783.9396204999593,
+        5: 4891.9698102499797,
+        6: 2445.9849051249898,
+        7: 1222.9924525624899,
+        8: 611.49622628138002,
+        9: 305.74811314055802,
+        10: 152.874056570411,
+        11: 76.437028285073197,
+        12: 38.218514142536598,
+        13: 19.109257071268299,
+        14: 9.5546285356341496,
+        15: 4.7773142679493699,
+        16: 2.38865713397468,
+        17: 1.1943285668550501,
+        18: 0.59716428355981699,
+        19: 0.29858214164761698,
+        20: 0.14929107082381,
+        21: 0.07464553541191,
+        22: 0.0373227677059525,
+        23: 0.0186613838529763
       }
     },
 
@@ -2435,7 +2429,7 @@
               this.fire('lodmap');
             } else if (map.options.crs && map.options.crs.code && (map.options.crs.code.indexOf(sr) > -1)) ; else {
               // if the service was cached in a custom projection and an appropriate LOD hasn't been defined in the map, guide the developer to our Proj4 sample
-              warn('L.esri.TiledMapLayer is using a non-mercator spatial reference. Support may be available through Proj4Leaflet http://esri.github.io/esri-leaflet/examples/non-mercator-projection.html');
+              warn('L.esri.TiledMapLayer is using a non-mercator spatial reference. Support may be available through Proj4Leaflet https://developers.arcgis.com/esri-leaflet/samples/non-mercator-projection/');
             }
           }
         }, this);
@@ -2699,7 +2693,7 @@
         };
 
         var onOverlayLoad = function (e) {
-          image.off('error', onOverlayLoad, this);
+          image.off('error', onOverlayError, this);
           if (this._map) {
             var newImage = e.target;
             var oldImage = this._currentImage;
@@ -3129,7 +3123,9 @@
       }
 
       // remove extraneous vertices from response features if it has not already been done
-      identifyRequest.params.maxAllowableOffset ? true : identifyRequest.simplify(this._map, 0.5);
+      if (!identifyRequest.params.maxAllowableOffset) {
+        identifyRequest.simplify(this._map, 0.5);
+      }
 
       if (!(this.options.popup && this.options.popup.params && this.options.popup.params.layers)) {
         if (this.options.layers) {
@@ -3142,7 +3138,7 @@
       // if present, pass layer ids and sql filters through to the identify task
       if (this.options.layerDefs && typeof this.options.layerDefs !== 'string' && !identifyRequest.params.layerDefs) {
         for (var id in this.options.layerDefs) {
-          if (this.options.layerDefs.hasOwnProperty(id)) {
+          if (Object.prototype.hasOwnProperty.call(this.options.layerDefs, id)) {
             identifyRequest.layerDef(id, this.options.layerDefs[id]);
           }
         }
@@ -3339,19 +3335,19 @@
     },
 
     removeCell: function () {
-      return;
+
     },
 
     reuseCell: function () {
-      return;
+
     },
 
     cellLeave: function () {
-      return;
+
     },
 
     cellEnter: function () {
-      return;
+
     },
     // @section
     // @method getCellSize: Point
@@ -3503,14 +3499,14 @@
 
       this._wrapX = crs.wrapLng &&
         !this.options.noWrap && [
-          Math.floor(map.project([0, crs.wrapLng[0]], cellZoom).x / cellSize.x),
-          Math.ceil(map.project([0, crs.wrapLng[1]], cellZoom).x / cellSize.y)
-        ];
+        Math.floor(map.project([0, crs.wrapLng[0]], cellZoom).x / cellSize.x),
+        Math.ceil(map.project([0, crs.wrapLng[1]], cellZoom).x / cellSize.y)
+      ];
       this._wrapY = crs.wrapLat &&
         !this.options.noWrap && [
-          Math.floor(map.project([crs.wrapLat[0], 0], cellZoom).y / cellSize.x),
-          Math.ceil(map.project([crs.wrapLat[1], 0], cellZoom).y / cellSize.y)
-        ];
+        Math.floor(map.project([crs.wrapLat[0], 0], cellZoom).y / cellSize.x),
+        Math.ceil(map.project([crs.wrapLat[1], 0], cellZoom).y / cellSize.y)
+      ];
     },
 
     _onMoveEnd: function (e) {
@@ -4937,8 +4933,38 @@
 
       // looks like a path (polygon/polyline)
       if (layer && layer.setStyle && this.options.style) {
-        this.resetStyle(geojson.id);
+        this.resetFeatureStyle(geojson.id);
       }
+    },
+
+    // This is the same as the Layer.openPopup method except it excludes the `FeatureGroup`
+    // logic to work around https://github.com/Leaflet/Leaflet/issues/8761
+    openPopup (latlng) {
+      if (this._popup) {
+        if (this._popup._prepareOpen(latlng || this._latlng)) {
+          // open the popup on the map
+          this._popup.openOn(this._map);
+        }
+      }
+      return this;
+    },
+
+    // This is the same as the `Layer.openTooltip` method except it excludes the `FeatureGroup`
+    // logic to work around https://github.com/Leaflet/Leaflet/issues/8761
+    openTooltip (latlng) {
+      if (this._tooltip) {
+        if (this._tooltip._prepareOpen(latlng)) {
+          // open the tooltip on the map
+          this._tooltip.openOn(this._map);
+
+          if (this.getElement) {
+            this._setAriaDescribedByOnLayer(this);
+          } else if (this.eachLayer) {
+            this.eachLayer(this._setAriaDescribedByOnLayer, this);
+          }
+        }
+      }
+      return this;
     }
   });
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mars2d-esri",
-	"version": "3.1.18",
+	"version": "3.1.19",
 	"description": "Mars2D平台插件,ArcGIS Server功能支持插件",
 	"main": "dist/mars2d-esri.js",
 	"files": [
@@ -8,7 +8,7 @@
 	],
 	"dependencies": {},
 	"devDependencies": {
-		"mars2d": "~3.1.18"
+		"mars2d": "~3.1.19"
 	},
 	"scripts": {
 		"lint": "eslint ./src/**/*.{js,ts} --fix"