marker updates

radarlabs · May 8, 2024 · 0acc5b3 · 0acc5b3
1 parent 9fd57f2
commit 0acc5b3
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 20 deletions.
diff --git a/src/http.ts b/src/http.ts
@@ -31,14 +31,14 @@ class Http {
     path,
     data,
     host,
-    versioned = true,
+    version,
     headers = {},
   }: {
     method: HttpMethod;
     path: string;
     data?: any;
     host?: string;
-    versioned?: boolean;
+    version?: string;
     headers?: Record<string, string>;
   }) {
     return new Promise<HttpResponse>((resolve, reject) => {
@@ -53,12 +53,8 @@ class Http {
 
       // setup request URL
       const urlHost = host || options.host;
-      const version = options.version;
-      let url = `${urlHost}/${version}/${path}`;
-
-      if (!versioned) {
-        url = `${urlHost}/${path}`;
-      }
+      const urlVersion = version || options.version;
+      let url = `${urlHost}/${urlVersion}/${path}`;
 
       // remove undefined values from request data
       let body: any = {};
@@ -98,11 +94,11 @@ class Http {
       }
 
       // combines default headers with custom headers and config headers
-      const allHeaders = Object.assign(defaultHeaders, headers, configHeaders);
+      const allHeaders = Object.assign(defaultHeaders, configHeaders, headers);
 
-      // set headers 
-      Object.entries(allHeaders).forEach(([key, val]) => {
-        xhr.setRequestHeader(key, val);
+      // set headers
+      Object.keys(allHeaders).forEach((key) => {
+        xhr.setRequestHeader(key, allHeaders[key]);
       });
 
       if (allHeaders['Content-Type'] === 'image/png') {

diff --git a/src/ui/RadarMap.ts b/src/ui/RadarMap.ts
@@ -30,7 +30,7 @@ const createStyleURL = (options: RadarOptions, style: string = DEFAULT_STYLE) =>
   `${options.host}/maps/styles/${style}?publishableKey=${options.publishableKey}`
 );
 
-/** Check if style is a Radar style or a custom style */
+// check if style is a Radar style or a custom style
 const isRadarStyle = (style: string) => {
   if (RADAR_STYLES.includes(style)) { // Radar built-in style
     return true;
@@ -41,7 +41,7 @@ const isRadarStyle = (style: string) => {
   return false;
 };
 
-/** Use formatted style URL if using one of Radar's out-of-the-box styles or is a Radar custom style */
+// use formatted style URL if using one of Radar's out-of-the-box styles or is a Radar custom style
 const getStyle = (options: RadarOptions, mapOptions: RadarMapOptions) => {
   const style = mapOptions.style;
 
@@ -124,6 +124,14 @@ class RadarMap extends maplibregl.Map {
     this.on('load', onResize);
   }
 
+  addMarker(marker: RadarMarker) {
+    this._markers.push(marker);
+  }
+
+  removeMarker(marker: RadarMarker) {
+    this._markers = this._markers.filter((mapMarker: RadarMarker) => mapMarker !== marker);
+  }
+
   getMarkers(): RadarMarker[] {
     return this._markers;
   }

diff --git a/src/ui/RadarMarker.ts b/src/ui/RadarMarker.ts
@@ -66,17 +66,17 @@ class RadarMarker extends maplibregl.Marker {
         Logger.error(`Invalid custom marker extension ${ext} - falling back to default marker`);
       } else {
         this._customMarkerId = markerOptions.customMarkerId;
-
         const originalElement = this._element.cloneNode(true);
         this._element.childNodes.forEach((child) => {
           child.remove();
         });
         const contentType = fileExtensionToContentType[ext];
 
+        // fetch custom marker
         Http.request({
           method: 'GET',
-          versioned: false,
-          path: `maps/PlACEHOLDER/markers/${markerOptions.customMarkerId}`,
+          version: 'maps',
+          path: `markers/${markerOptions.customMarkerId}`,
           headers: {
             'Content-Type': contentType,
           },
@@ -107,13 +107,13 @@ class RadarMarker extends maplibregl.Marker {
   }
 
   addTo(map: RadarMap) {
-    map._markers.push(this);
+    map.addMarker(this);
     return super.addTo(map);
   }
 
   remove() {
     if (this._map) {
-      this._map._markers = this._map._markers.filter((marker) => marker !== this);
+      this._map.removeMarker(this);
     }
     return super.remove();
   }
@@ -137,4 +137,4 @@ class RadarMarker extends maplibregl.Marker {
   }
 }
 
-export default RadarMarker;
+export default RadarMarker;