refactor: remove proj4leaflet (no raster reprojection), update cesium labels, text opacity

package-lock.json

@@ -26,7 +26,6 @@
         "leaflet-bing-layer": "^3.3.1",
         "leaflet.markercluster": "^1.4.1",
         "material-design-icons-iconfont": "^6.7.0",
-        "proj4leaflet": "^1.0.2",
         "remark": "^13.0.0",
         "remark-html": "^13.0.2",
         "remark-strip-html": "^1.0.2",
@@ -23634,11 +23633,6 @@
         "node": ">= 0.6"
       }
     },
-    "node_modules/mgrs": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/mgrs/-/mgrs-1.0.0.tgz",
-      "integrity": "sha512-awNbTOqCxK1DBGjalK3xqWIstBZgN6fxsMSiXLs9/spqWkF2pAhb2rrYCFSsr1/tT7PhcDGjZndG8SWYn0byYA=="
-    },
     "node_modules/microevent.ts": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/microevent.ts/-/microevent.ts-0.1.1.tgz",
@@ -26573,23 +26567,6 @@
         "node": ">=0.4.0"
       }
     },
-    "node_modules/proj4": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/proj4/-/proj4-2.8.0.tgz",
-      "integrity": "sha512-baC+YcD4xsSqJ+CpCZljj2gcQDhlKb+J+Zjv/2KSBwWNjk4M0pafgQsE+mWurd84tflMIsP+7j7mtIpFDHzQfQ==",
-      "dependencies": {
-        "mgrs": "1.0.0",
-        "wkt-parser": "^1.3.1"
-      }
-    },
-    "node_modules/proj4leaflet": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/proj4leaflet/-/proj4leaflet-1.0.2.tgz",
-      "integrity": "sha512-6GdDeUlhX/tHUiMEj80xQhlPjwrXcdfD0D5OBymY8WvxfbmZcdhNqQk7n7nFf53ue6QdP9ls9ZPjsAxnbZDTsw==",
-      "dependencies": {
-        "proj4": "^2.3.14"
-      }
-    },
     "node_modules/promise": {
       "version": "7.3.1",
       "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
@@ -33556,11 +33533,6 @@
         "node": ">= 10.0.0"
       }
     },
-    "node_modules/wkt-parser": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/wkt-parser/-/wkt-parser-1.3.2.tgz",
-      "integrity": "sha512-A26BOOo7sHAagyxG7iuRhnKMO7Q3mEOiOT4oGUmohtN/Li5wameeU4S6f8vWw6NADTVKljBs8bzA8JPQgSEMVQ=="
-    },
     "node_modules/wmf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wmf/-/wmf-1.0.2.tgz",
@@ -54482,11 +54454,6 @@
       "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
       "dev": true
     },
-    "mgrs": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/mgrs/-/mgrs-1.0.0.tgz",
-      "integrity": "sha512-awNbTOqCxK1DBGjalK3xqWIstBZgN6fxsMSiXLs9/spqWkF2pAhb2rrYCFSsr1/tT7PhcDGjZndG8SWYn0byYA=="
-    },
     "microevent.ts": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/microevent.ts/-/microevent.ts-0.1.1.tgz",
@@ -56943,23 +56910,6 @@
       "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
       "dev": true
     },
-    "proj4": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/proj4/-/proj4-2.8.0.tgz",
-      "integrity": "sha512-baC+YcD4xsSqJ+CpCZljj2gcQDhlKb+J+Zjv/2KSBwWNjk4M0pafgQsE+mWurd84tflMIsP+7j7mtIpFDHzQfQ==",
-      "requires": {
-        "mgrs": "1.0.0",
-        "wkt-parser": "^1.3.1"
-      }
-    },
-    "proj4leaflet": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/proj4leaflet/-/proj4leaflet-1.0.2.tgz",
-      "integrity": "sha512-6GdDeUlhX/tHUiMEj80xQhlPjwrXcdfD0D5OBymY8WvxfbmZcdhNqQk7n7nFf53ue6QdP9ls9ZPjsAxnbZDTsw==",
-      "requires": {
-        "proj4": "^2.3.14"
-      }
-    },
     "promise": {
       "version": "7.3.1",
       "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
@@ -62949,11 +62899,6 @@
         "babel-walk": "3.0.0-canary-5"
       }
     },
-    "wkt-parser": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/wkt-parser/-/wkt-parser-1.3.2.tgz",
-      "integrity": "sha512-A26BOOo7sHAagyxG7iuRhnKMO7Q3mEOiOT4oGUmohtN/Li5wameeU4S6f8vWw6NADTVKljBs8bzA8JPQgSEMVQ=="
-    },
     "wmf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wmf/-/wmf-1.0.2.tgz",

package.json

@@ -36,7 +36,6 @@
     "leaflet-bing-layer": "^3.3.1",
     "leaflet.markercluster": "^1.4.1",
     "material-design-icons-iconfont": "^6.7.0",
-    "proj4leaflet": "^1.0.2",
     "remark": "^13.0.0",
     "remark-html": "^13.0.2",
     "remark-strip-html": "^1.0.2",

src/modules/metadata/components/Geoservices/MapCesium.vue

@@ -328,6 +328,7 @@ export default {
               text: entity.properties?.name,
               scale: 0.5,
               verticalOrigin: VerticalOrigin.TOP,
+              fillColor: Color.BLACK,
               // horizontalOrigin: HorizontalOrigin.LEFT,
               // pixelOffset: new Cartesian2(0.0, -40.0), // Show above ground?
             });

src/modules/metadata/components/Geoservices/MapLeaflet.vue

@@ -286,13 +286,6 @@ export default {
       if (this.isGcnet) {
         // Disable editing
         this.mapEditable = false;
-
-        // Reproject EPSG:5938
-        // var crs = L.Proj.CRS("EPSG:5938",{
-        //     origin: [-180,90],
-        //     scaleDenominators: [2000,1000,500,200,100,50,20,10],
-        // });
-        console.log('GCNET!');
       }
 
       this.map = new L.Map(this.$refs.map, {
@@ -417,7 +410,7 @@ export default {
             className: 'rounded-circle green',
             iconSize: [20, 20],
           }),
-          opacity: 0.65,
+          opacity: 0.75,
           riseOnHover: true,
         },
         gcnetInactiveStyle: {
@@ -425,7 +418,7 @@ export default {
             className: 'rounded-circle red',
             iconSize: [20, 20],
           }),
-          opacity: 0.35,
+          opacity: 0.75,
           riseOnHover: true,
         },
         gcnetMissingStyle: {
@@ -433,7 +426,7 @@ export default {
             className: 'rounded-circle grey',
             iconSize: [20, 20],
           }),
-          opacity: 0.65,
+          opacity: 0.75,
           riseOnHover: true,
         },
       };