Changeset 32811 in osm for applications/editors/josm/plugins/opendata

Timestamp:

2016-08-15T11:56:50+02:00 (8 years ago)

Author:

donvip

Message:

fix #13326 - NPE

File:

• applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/layers/OdDataLayer.java (modified) (1 diff)

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/layers/OdDataLayer.java

@@ -89 +89 @@
 
     public final void downloadOsmData() {
-        String oapiReq = handler.getOverpassApiRequest(bounds);
-        Collection<String> xapiReqs = handler.getOsmXapiRequests(bounds);
-        if (oapiReq != null || xapiReqs != null) {
-            DataSet dataSet = new DataSet();
-            final OdOsmDataLayer layer = new OdOsmDataLayer(this, dataSet, getName()+"/OSM");
-            addOsmLayer(layer);
-            Main.getLayerManager().setActiveLayer(osmLayer);
-            if (oapiReq != null) {
-                OsmDownloader.downloadOapi(oapiReq);
-                // Overpass API does not allow to exclude tags :(
-                layer.removeForbiddenTags();
-            } else {
-                OsmDownloader.downloadXapi(xapiReqs);
+        if (handler != null) {
+            String oapiReq = handler.getOverpassApiRequest(bounds);
+            Collection<String> xapiReqs = handler.getOsmXapiRequests(bounds);
+            if (oapiReq != null || xapiReqs != null) {
+                DataSet dataSet = new DataSet();
+                final OdOsmDataLayer layer = new OdOsmDataLayer(this, dataSet, getName()+"/OSM");
+                addOsmLayer(layer);
+                Main.getLayerManager().setActiveLayer(osmLayer);
+                if (oapiReq != null) {
+                    OsmDownloader.downloadOapi(oapiReq);
+                    // Overpass API does not allow to exclude tags :(
+                    layer.removeForbiddenTags();
+                } else {
+                    OsmDownloader.downloadXapi(xapiReqs);
+                }
             }
         }