Migrate to mapbox #997 - added limited support to arcgis, added rtl, …

…fixed expression changed after check error
IsraelHikingMap · Apr 22, 2019 · 6848e49 · 6848e49
1 parent 1dc76ba
commit 6848e49
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 5 deletions.
diff --git a/IsraelHiking.Web/angular.json b/IsraelHiking.Web/angular.json
@@ -22,13 +22,18 @@
               "sources/resource-not-found.html",
               "sources/empty-for-oauth.html",
               "sources/robots.txt",
-              "sources/cordova.js"
+              "sources/cordova.js",
+              {
+                "glob": "**/mapbox-gl-rtl-text.js",
+                "input": "./node_modules/@mapbox/mapbox-gl-rtl-text",
+                "output": "./"
+              }
             ],
             "styles": [
               "sources/scss/common.scss"
             ],
             "scripts": [
-              "sources/google-analytics.js",
+              "sources/google-analytics.js"
             ]
           },
           "configurations": {

diff --git a/IsraelHiking.Web/package.json b/IsraelHiking.Web/package.json
@@ -15,6 +15,7 @@
     "@angular/platform-server": "7.1.1",
     "@angular/router": "7.1.1",
     "@beyerleinf/ngx-dnd": "6.0.0-preview3",
+    "@mapbox/mapbox-gl-rtl-text": "0.2.1",
     "@ngx-progressbar/core": "5.3.1",
     "@ngx-progressbar/http": "5.3.1",
     "@nicky-lenaers/ngx-scroll-to": "1.1.1",
@@ -110,6 +111,7 @@
     "build": "ng build",
     "build:watch": "ng build --watch",
     "build:prod": "ng build --prod",
+    "build:prod-beta": "ng build --prod --base-href=/beta/",
     "test": "ng test",
     "lint": "ng lint --fix",
     "version": "node -v && npm -v && ng -v",

diff --git a/...elHiking.Web/sources/application/components/map/automatic-layer-presentation.component.ts b/...elHiking.Web/sources/application/components/map/automatic-layer-presentation.component.ts
@@ -69,13 +69,19 @@ export class AutomaticLayerPresentationComponent implements OnInit, OnChanges, O
     }
 
     private isRaster(address: string) {
-        return !address.endsWith("json") && !address.endsWith("/mapserver");
+        return !address.endsWith("json");
     }
 
     private createRasterLayer() {
+        let address = this.address;
+        if (this.address.toLocaleLowerCase().endsWith("/mapserver")) {
+            //address += "/tile/{z}/{y}/{x}"
+            address += "/export?dpi=96&transparent=true&format=png32&bbox={bbox-epsg-3857}&bboxSR=3857&imageSR=3857&size=256,256&f=image";
+        }
+        console.log("adrs:", address);
         let source = {
             type: "raster",
-            tiles: [this.address],
+            tiles: [address],
             minzoom: this.minZoom,
             maxzoom: this.maxZoom,
             tileSize: 256

diff --git a/IsraelHiking.Web/sources/application/components/map/layers-view.component.ts b/IsraelHiking.Web/sources/application/components/map/layers-view.component.ts
@@ -48,6 +48,7 @@ export class LayersViewComponent extends BaseMapComponent implements OnInit, Aft
         this.categoriesTypes = this.poiService.getCategoriesTypes();
         this.selectedCluster = null;
         this.hoverFeature = null;
+        this.selectedPoiFeature = null;
         this.selectedPoiGeoJson = {
             type: "FeatureCollection",
             features: []

diff --git a/IsraelHiking.Web/sources/application/components/map/main-map.component.ts b/IsraelHiking.Web/sources/application/components/map/main-map.component.ts
@@ -2,7 +2,7 @@ import { Component, ViewChild, AfterViewInit, ViewEncapsulation, ViewChildren, Q
 import { NgxImageGalleryComponent } from "ngx-image-gallery";
 import { NgRedux } from "@angular-redux/store";
 import { MapComponent, CustomControl } from "ngx-mapbox-gl";
-import { Style } from "mapbox-gl";
+import { Style, setRTLTextPlugin } from "mapbox-gl";
 
 import { ResourcesService } from "../../services/resources.service";
 import { BaseMapComponent } from "../base-map.component";
@@ -120,6 +120,8 @@ export class MainMapComponent extends BaseMapComponent implements AfterViewInit
         this.imageGalleryService.setGalleryComponent(this.ngxImageGallery);
     }
     public mapLoaded() {
+        setRTLTextPlugin("/mapbox-gl-rtl-text.js", () => {});
+
         this.mapService.setMap(this.mapComponent.mapInstance);
         this.snappingService.setMap(this.mapComponent.mapInstance);