Merge pull request 'do not exclude indoor panoramas' (#37) from feature/pano-could-be-indoor into develop

Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/37

public/static/js/map_editor.js

@@ -80,22 +80,16 @@
             MapEditor.panorama.setPano(panoLocationData.pano);
         },
 
-        requestPanoData: function (location, canBeIndoor) {
+        requestPanoData: function (location) {
             var sv = new google.maps.StreetViewService();
 
             sv.getPanorama({
                 location: location,
                 preference: google.maps.StreetViewPreference.NEAREST,
-                radius: 100,
+                radius: MapEditor.map.getSearchRadius(location),
-                source: canBeIndoor ? google.maps.StreetViewSource.DEFAULT : google.maps.StreetViewSource.OUTDOOR
             }, function (data, status) {
                 var panoLocationData = status === google.maps.StreetViewStatus.OK ? data.location : null;
 
-                if (panoLocationData === null && !canBeIndoor) {
-                    MapEditor.requestPanoData(location, true);
-                    return;
-                }
-
                 document.getElementById('loading').style.visibility = 'hidden';
 
                 MapEditor.loadPanoForNewPlace(panoLocationData);
@@ -473,7 +467,11 @@
             LMapWrapper.markers.removeLayer(marker);
         },
 
-        toggleStreetViewCover: function () { }
+        toggleStreetViewCover: function () { },
+
+        getSearchRadius: function (location) {
+            return 100;
+        }
     };
 
     var GMapWrapper = {
@@ -626,6 +624,20 @@
                 GMapWrapper.streetViewCover.setMap(GMapWrapper.map);
                 GMapWrapper.streetViewCoverOn = true;
             }
+        },
+
+        getSearchRadius: function (location) {
+            // source: https://www.yorku.ca/mack/CHI01.htm
+            var movementOffset = 4;
+
+            // source: https://groups.google.com/g/google-maps-js-api-v3/c/hDRO4oHVSeM/m/osOYQYXg2oUJ?pli=1
+            var metersPerPixel = 156543.03392 * Math.cos(location.lat * Math.PI / 180) / Math.pow(2, GMapWrapper.map.getZoom());
+
+            var minSearchRadius = 5;
+
+            var searchRadius = Math.max(minSearchRadius, Math.round(movementOffset * metersPerPixel));
+
+            return searchRadius;
         }
     };
 

src/PersistentData/Model/Place.php

@@ -140,7 +140,7 @@ class Place extends Model
         return $this->pov->getZoom();
     }
 
-    public function getFreshPanoId(bool $canBeIndoor = false): ?string
+    public function getFreshPanoId(): ?string
     {
         if (
             $this->panoIdCachedTimestamp !== null &&
@@ -152,19 +152,13 @@ class Place extends Model
         $request = new Request('https://maps.googleapis.com/maps/api/streetview/metadata', Request::HTTP_GET);
         $request->setQuery([
             'key' => $_ENV['GOOGLE_MAPS_SERVER_API_KEY'],
-            'location' => $this->position->getLat() . ',' . $this->position->getLng(),
+            'location' => $this->position->getLat() . ',' . $this->position->getLng()
-            'source' => $canBeIndoor ? 'default' : 'outdoor'
         ]);
 
         $response = $request->send();
         $panoData = json_decode($response->getBody(), true);
         $panoId = $panoData['status'] === 'OK' ? $panoData['pano_id'] : null;
 
-        // enable indoor panos if no outdoor found
-        if ($panoId === null && !$canBeIndoor) {
-            return $this->getFreshPanoId(true);
-        }
-
         $this->panoIdCached = $panoId;
         $this->panoIdCachedTimestamp = new DateTime();