change tile provider

map fixes

Author: drkane

findthatpostcode/__init__.py

@@ -3,10 +3,9 @@
 import re
 
 import sentry_sdk
-from flask import Flask, make_response, render_template, request
+from flask import Flask, make_response, render_template
 from flask_cors import CORS
 from sentry_sdk.integrations.flask import FlaskIntegration
-from ua_parser import user_agent_parser
 
 from findthatpostcode import blueprints, commands, db
 from findthatpostcode.controllers.areatypes import area_types_count
@@ -107,34 +106,4 @@ def about():
 
     blueprints.init_app(app)
 
-    @app.after_request
-    def request_log(response):
-        ua = user_agent_parser.Parse(request.user_agent.string)
-        if request.endpoint == "static":
-            return response
-        db.get_log_db()["logs"].insert(
-            {
-                "app": "findthatpostcode",
-                "timestamp": datetime.datetime.now().isoformat(),
-                "url": request.url,
-                "path": request.path,
-                "method": request.method,
-                "params": request.args.to_dict(),
-                "origin": request.origin,
-                "referrer": request.referrer,
-                # "remote_addr": request.remote_addr,  # we don't collect IP address
-                "endpoint": request.endpoint,
-                "view_args": request.view_args,
-                "user_agent_string": ua.get("string") if ua else None,
-                "user_agent": {k: v for k, v in ua.items() if k != "string"}
-                if ua
-                else None,
-                "status_code": response.status_code,
-                "response_size": response.content_length,
-                "content_type": response.mimetype,
-            },
-        )
-        db.close_log_db()
-        return response
-
     return app

findthatpostcode/blueprints/areas.py

@@ -106,7 +106,15 @@ def get_area(areacode, filetype="json"):
         return jsonify(r)
 
     return return_result(
-        result, filetype, "area.html.j2", child=request.values.get("child")
+        result,
+        filetype,
+        "area.html.j2",
+        child=request.values.get("child"),
+        example_postcode_json=[
+            p.attributes.get("location")
+            for p in result.relationships["example_postcodes"]
+            if p.attributes.get("location")
+        ],
     )
 
 

findthatpostcode/limiter.py

@@ -16,7 +16,7 @@ def exempt_if_header():
 
 limiter = Limiter(
     get_remote_address,
-    default_limits=["2 per minute"],
+    default_limits=["2 per second"],
     application_limits=["20000 per day"],
     storage_uri="memory://",
     headers_enabled=True,

findthatpostcode/static/js/map.js

@@ -10,12 +10,12 @@ if (window.postcodes && postcodes.length > 0) {
 var mymap = L.map('postcode-map', {
     zoomSnap: 0.1
 }).setView(center, 9);
-// var layer = new L.tileLayer('https://tiles.stadiamaps.com/tiles/stamen_terrain/{z}/{x}/{y}{r}.png', {
-//     attribution: '&copy; <a href="https://stadiamaps.com/" target="_blank">Stadia Maps</a> <a href="https://www.stamen.com/" target="_blank">&copy; Stamen Design</a> &copy; <a href="https://openmaptiles.org/" target="_blank">OpenMapTiles</a> &copy; <a href="https://www.openstreetmap.org/about" target="_blank">OpenStreetMap</a> contributors',
-// }).addTo(mymap);
 var layer = L.maplibreGL({
-    style: 'https://tiles.stadiamaps.com/styles/alidade_smooth.json',
-    attribution: '&copy; <a href="https://stadiamaps.com/" target="_blank">Stadia Maps</a> <a href="https://www.stamen.com/" target="_blank">&copy; Stamen Design</a> &copy; <a href="https://openmaptiles.org/" target="_blank">OpenMapTiles</a> &copy; <a href="https://www.openstreetmap.org/about" target="_blank">OpenStreetMap</a> contributors',
+    style: 'https://tiles.openfreemap.org/styles/positron',
+    attribution: `
+    <a href="https://openfreemap.org" target="_blank">OpenFreeMap</a> 
+    <a href="https://www.openmaptiles.org/" target="_blank">&copy; OpenMapTiles</a> 
+    Data from <a href="https://www.openstreetmap.org/copyright" target="_blank">OpenStreetMap</a>`,
 }).addTo(mymap);
 L.osGraticule({ showLabels: false, lineColor: '#ddd' }).addTo(mymap);
 
@@ -30,7 +30,7 @@ if (document.getElementById('location-map')) {
         scrollWheelZoom: false,
     });
     var layer = L.maplibreGL({
-        style: 'https://tiles.stadiamaps.com/styles/alidade_smooth.json',
+        style: 'https://tiles.openfreemap.org/styles/positron',
     }).addTo(location_map);
     location_map.fitBounds(UK_BOUNDS);
     location_map.setMinZoom(location_map.getZoom());

findthatpostcode/templates/area.html.j2

@@ -174,11 +174,13 @@
 {% endblock %}
 
 {% block bodyscripts %}
-{% if example_postcodes or result.has_boundary %}
+{% if example_postcode_json or result.has_boundary %}
 <script type="text/javascript">
-  var postcodes = [
-    {% for p in example_postcodes %}{% if p.attributes.location %} { { p.attributes.location | tojson } },
-  {% endif %} {% endfor %}];
+  {% if example_postcode_json %}
+  var postcodes = {{ example_postcode_json | tojson }};
+  {% else %}
+  var postcodes = null;
+  {% endif %}
   {% if result.has_boundary %}
   var geojson = {{ url_for('areas.get_area_boundary', areacodes = result.id) | tojson }};
   {% else %}

findthatpostcode/templates/postcode.html.j2

@@ -53,9 +53,12 @@
 
   {% if result.attributes.location %}
   <div class="fl w-two-thirds-l w-100">
-    <figure class="ma0 pa0">
+    <figure class="ma0 w-70 fl">
       <div id="postcode-map" style="height:500px;"></div>
     </figure>
+    <figure class="ma0 w-30 fl">
+      <div id="location-map" style="height:500px;"></div>
+    </figure>
     <p class="f5 b mt0 mb1 w-100">
       {% if result.get_area('laua') %}
       Approximate location within