From 44cbbf77358e4f311d91238f972395bb69f92f56 Mon Sep 17 00:00:00 2001
From: dadiorchen <dadiorchen@outlook.com>
Date: Thu, 25 Mar 2021 06:47:27 +0000
Subject: [PATCH] feat: freetown org name use tile server

---
 src/App.js |  6 ++++--
 src/map.js | 15 +++++++++------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/App.js b/src/App.js
index 4e1e1c098..c267fe0f7 100644
--- a/src/App.js
+++ b/src/App.js
@@ -272,12 +272,14 @@ function App() {
       top = y;
     }else{
       const marker = map.getMarkerByPointId()[tree.id]
-      const {x:left, y:top} = mapLeaflet.latLngToContainerPoint(marker.getLatLng());
+      const {x, y} = mapLeaflet.latLngToContainerPoint(marker.getLatLng());
+      left = x;
+      top =y;
     }
     log.log("top:", top, "left:", left);
     expect(top).number();
     expect(left).number();
-    if(left ){
+    if(true){
       log.log("the point at:", top, left);
       expect(SidePanel).property("WIDTH").number();
       const {clientWidth, clientHeight} = mapRef.current;
diff --git a/src/map.js b/src/map.js
index faa25e019..5876c4da0 100644
--- a/src/map.js
+++ b/src/map.js
@@ -204,12 +204,15 @@ var initMarkers = function(viewportBounds, zoomLevel) {
   log.log("request:", queryUrl);
   source = CancelToken.source();
 
+  //disable loading icon anyway
+  getApp().loadingB(false);
+
   //for tile server version, if zoom level > 15, and it isn't cases like
   //map_name, wallet, then do not request for points, just let the tile
   //server works.
   if(
     queryUrl.match(/zoom_level=(16|17|18|19|20|21|22)/) &&
-    !queryUrl.match(/(wallet|map_name|timeline|userid|token)/)
+    isUsingTile
   ){
     log.warn("quit, use tile server instead");
     clearOverlays(markers);
@@ -218,7 +221,6 @@ var initMarkers = function(viewportBounds, zoomLevel) {
 
 
   //loading
-  getApp().loadingB(false);
   if(!firstRender){
     loadingTimer = setTimeout(() => {
       getApp().loadingB(true);
@@ -403,10 +405,11 @@ var initMarkers = function(viewportBounds, zoomLevel) {
 //              }
             });
           marker.payload = {
-            id: item["id"]
+            id: item["id"],
+            lat: item["lat"],
+            lon: item["lon"],
           };
-          //NOTE close, use tile server to render points.
-          //marker.addTo(map);
+          marker.addTo(map);
 
           if (
             selectedTreeMarker &&
@@ -889,7 +892,7 @@ var initialize = function() {
   googleSat.addTo(map);
 
   //if isn't cases like wallet, org, then use tile
-  if(!token && !mapName && !treeid && !userid && !wallet){
+  if(!token && (mapName === undefined || mapName === "freetown") && !treeid && !userid && !wallet){
     log.info("use tile server");
     isUsingTile = true;
     var baseURL_def = process.env.REACT_APP_TILE_SERVER_URL;