Merge pull request #2139 from hansthen/issue_2138

Issue 2138: Fix awesome markers

Author: ocefpaf

.github/workflows/test_streamlit_folium.yml

@@ -38,16 +38,16 @@ jobs:
         npm install
         npm run build
 
-    - name: Install streamlit-folium
+    - name: Install streamlit_folium dev dependencies
       shell: bash -l {0}
       run: |
-        cd streamlit_folium
-        pip install -e .
+        conda install --file streamlit_folium/tests/requirements.txt
 
-    - name: Install streamlit_folium dev dependencies
+    - name: Install streamlit-folium
       shell: bash -l {0}
       run: |
-        pip install -r streamlit_folium/tests/requirements.txt
+        cd streamlit_folium
+        pip install -e .
 
     - name: Install playwright dependencies
       shell: bash -l {0}

folium/features.py

@@ -570,9 +570,9 @@ class GeoJson(Layer):
 
         {%- if this.marker %}
         function {{ this.get_name() }}_pointToLayer(feature, latlng) {
-            var opts = {{ this.marker.options | tojson | safe }};
+            var opts = {{ this.marker.options | tojavascript }};
             {% if this.marker._name == 'Marker' and this.marker.icon %}
-            const iconOptions = {{ this.marker.icon.options | tojson | safe }}
+            const iconOptions = {{ this.marker.icon.options | tojavascript }}
             const iconRootAlias = L{%- if this.marker.icon._name == "Icon" %}.AwesomeMarkers{%- endif %}
             opts.icon = new iconRootAlias.{{ this.marker.icon._name }}(iconOptions)
             {% endif %}