Merge branch 'praszuk/fix/cursor-not-on-the-map'

praszuk · Jul 12, 2022 · 6836fbd · 6836fbd
2 parents 31a788d + bf5d81b
commit 6836fbd
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/src/main/java/org/openstreetmap/josm/plugins/plbuildings/actions/BuildingsImportAction.java b/src/main/java/org/openstreetmap/josm/plugins/plbuildings/actions/BuildingsImportAction.java
@@ -46,12 +46,16 @@ public BuildingsImportAction() {
     }
 
     public static DataSet getBuildingsAtCurrentLocation(){
-        LatLon latLonPoint = MainApplication.getMap().mapView.getLatLon(
-            MainApplication.getMap().mapView.getMousePosition().getX(),
-            MainApplication.getMap().mapView.getMousePosition().getY()
-        );
-
-        return BuildingsDownloader.downloadBuildings(latLonPoint, "bdot");
+        try {
+            LatLon latLonPoint = MainApplication.getMap().mapView.getLatLon(
+                MainApplication.getMap().mapView.getMousePosition().getX(),
+                MainApplication.getMap().mapView.getMousePosition().getY()
+            );
+            return BuildingsDownloader.downloadBuildings(latLonPoint, "bdot");
+        }
+        catch (NullPointerException exception){
+            return null;
+        }
     }
 
     /**
@@ -71,7 +75,7 @@ public static void performBuildingImport(DataSet currentDataSet) {
         BuildingsImportStats.getInstance().addTotalImportActionCounter(1);
         DataSet importedBuildingsDataSet = getBuildingsAtCurrentLocation();
         if (importedBuildingsDataSet == null){
-            Logging.warn("Connection error: Cannot import building!");
+            Logging.warn("Downloading error: Cannot import building!");
             return;
         }
         if (importedBuildingsDataSet.isEmpty()) {