Changeset 19879 in osm for applications/editors/josm/haiti_earthquake

Timestamp:

2010-02-05T13:10:14+01:00 (15 years ago)

Author:

guggis

Message:

updated XPath expressions

File:

• applications/editors/josm/haiti_earthquake/hospitals/HospitalChunkCheck.groovy (modified) (3 diffs)

applications/editors/josm/haiti_earthquake/hospitals/HospitalChunkCheck.groovy

@@ -39 +39 @@
                 return "bbox=${minLon},${minLat},${maxLon},${maxLat}"           
         }
-                
+        
         def int countHospitalsInProximity(node) {
                 def bbox = buildQueryBbox(node)
                 def queryUrl = "http://xapi.openstreetmap.org/api/0.6/*[amenity=hospital][${bbox}]"
                 def xapiResponse = DOMBuilder.parse(new InputStreamReader(new URL(queryUrl).openStream(), "UTF-8"))
-                def int  count = xpath.evaluate("count(//node/tag[@k = 'amenity'][@v = 'hospital'])", xapiResponse, XPathConstants.NUMBER)
+                def int  count = xpath.evaluate("count(//tag[@k = 'amenity'][@v = 'hospital']/..)", xapiResponse, XPathConstants.NUMBER)
                 return count
         }
@@ -52 +52 @@
                 def queryUrl = "http://xapi.openstreetmap.org/api/0.6/*[health_facility:paho_id=*][${bbox}]"
                 def xapiResponse = DOMBuilder.parse(new InputStreamReader(new URL(queryUrl).openStream(), "UTF-8"))
-                def int count = xpath.evaluate("count(//node/tag[@k = 'health_facility:paho_id'])", xapiResponse, XPathConstants.NUMBER)
+                def int count = xpath.evaluate("count(//tag[@k = 'health_facility:paho_id']/..)", xapiResponse, XPathConstants.NUMBER)
                 return count
         }
@@ -60 +60 @@
                 def queryUrl = "http://xapi.openstreetmap.org/api/0.6/*[health_facility:paho_id=${id}]"
                 def xapiResponse = DOMBuilder.parse(new InputStreamReader(new URL(queryUrl).openStream(), "UTF-8"))
-                def int count = xpath.evaluate("count(//node/tag[@k = 'health_facility:paho_id'])", xapiResponse, XPathConstants.NUMBER)
+                def int count = xpath.evaluate("count(//tag[@k = 'health_facility:paho_id'][@v ='${id}'])", xapiResponse, XPathConstants.NUMBER)
                 return count > 0
         }