#470: fix misleading method name

Author: mmerdes

oshdb-util/src/test/java/org/heigit/ohsome/oshdb/util/geometry/helpers/OSMXmlReaderTagInterpreter.java

@@ -38,10 +38,10 @@ public boolean isArea(OSMEntity e) {
     if (e instanceof OSMWay) {
       OSMMember[] nds = ((OSMWay) e).getMembers();
       return nds.length >= 4 && nds[0].getId() == nds[nds.length - 1].getId()
-          && e.getTags().hasTagValue(area, areaYes);
+          && e.getTags().hasTag(area, areaYes);
     }
     if (e instanceof OSMRelation) {
-      return e.getTags().hasTagValue(type, typeMultipolygon);
+      return e.getTags().hasTag(type, typeMultipolygon);
     }
     return true;
   }

oshdb-util/src/test/java/org/heigit/ohsome/oshdb/util/osh/TestOSHEntityTimeUtils.java

@@ -58,7 +58,7 @@ void testGetModificationTimestampsNodeWithFilter() throws IOException {
     ));
 
     List<OSHDBTimestamp> tss =
-        OSHEntityTimeUtils.getModificationTimestamps(hnode, e -> e.getTags().hasTagValue(1, 1));
+        OSHEntityTimeUtils.getModificationTimestamps(hnode, e -> e.getTags().hasTag(1, 1));
 
     assertNotNull(tss);
     assertEquals(2, tss.size());
@@ -176,7 +176,7 @@ void testGetModificationTimestampsWayWithFilter() throws IOException {
 
     tss = OSHEntityTimeUtils.getModificationTimestamps(
         hway,
-        osmEntity -> osmEntity.getTags().hasTagValue(2, 1)
+        osmEntity -> osmEntity.getTags().hasTag(2, 1)
     );
     assertNotNull(tss);
     assertEquals(5, tss.size());

oshdb/src/main/java/org/heigit/ohsome/oshdb/OSHDBTags.java

@@ -46,7 +46,7 @@ public boolean hasTagKey(OSHDBTagKey key) {
    * @param value the value to search for.
    * @return true, if key/value combination is present.
    */
-  public abstract boolean hasTagValue(int key, int value);
+  public abstract boolean hasTag(int key, int value);
 
   /**
    * Test for a certain key/value combination.
@@ -136,7 +136,7 @@ public boolean hasTagKeyExcluding(int key, int[] uninterestingValues) {
     }
 
     @Override
-    public boolean hasTagValue(int key, int value) {
+    public boolean hasTag(int key, int value) {
       return hasTag(new OSHDBTag(key, value));
     }
 

oshdb/src/test/java/org/heigit/ohsome/oshdb/OSHDBTagsTest.java

@@ -45,11 +45,11 @@ void testArrayHasTagKeyExcluding() {
   void testArrayHasTagValue() {
     var tags = OSHDBTags.of(kvs);
 
-    assertTrue(tags.hasTagValue(1, 2));
+    assertTrue(tags.hasTag(1, 2));
 
-    assertFalse(tags.hasTagValue(2, 2));
-    assertFalse(tags.hasTagValue(3, 4));
-    assertFalse(tags.hasTagValue(5, 6));
+    assertFalse(tags.hasTag(2, 2));
+    assertFalse(tags.hasTag(3, 4));
+    assertFalse(tags.hasTag(5, 6));
   }
 
   @Test()

oshdb/src/test/java/org/heigit/ohsome/oshdb/osm/OSMNodeTest.java

@@ -172,12 +172,12 @@ void testHasTagValue() {
     OSMNode instance =
         OSM.node(1L, 1, 1L, 1L, 1, new int[] {1, 2, 2, 3}, 1000000000, 1000000000);
     boolean expResult = false;
-    boolean result = instance.getTags().hasTagValue(1, 1);
+    boolean result = instance.getTags().hasTag(1, 1);
     assertEquals(expResult, result);
 
     instance = OSM.node(1L, 1, 1L, 1L, 1, new int[] {1, 1, 2, 3}, 1000000000, 1000000000);
     expResult = true;
-    result = instance.getTags().hasTagValue(1, 1);
+    result = instance.getTags().hasTag(1, 1);
     assertEquals(expResult, result);
   }
 

oshdb/src/test/java/org/heigit/ohsome/oshdb/osm/OSMRelationTest.java

@@ -142,7 +142,7 @@ void testHasTagValue() {
     OSMRelation instance =
         OSM.relation(1L, 1, 1L, 1L, 1, new int[] {1, 2, 2, 3}, new OSMMember[] {part, part});
     boolean expResult = false;
-    boolean result = instance.getTags().hasTagValue(1, 1);
+    boolean result = instance.getTags().hasTag(1, 1);
     assertEquals(expResult, result);
   }
 
@@ -152,7 +152,7 @@ void testHasTagValue2() {
     OSMRelation instance =
         OSM.relation(1L, 1, 1L, 1L, 1, new int[] {1, 1, 2, 3}, new OSMMember[] {part, part});
     boolean expResult = true;
-    boolean result = instance.getTags().hasTagValue(1, 1);
+    boolean result = instance.getTags().hasTag(1, 1);
     assertEquals(expResult, result);
   }
 }

oshdb/src/test/java/org/heigit/ohsome/oshdb/osm/OSMWayTest.java

@@ -141,13 +141,13 @@ void testHasTagValue() {
     OSMWay instance =
         OSM.way(1L, 1, 1L, 1L, 1, new int[] {1, 2, 2, 3}, new OSMMember[] {part, part});
     boolean expResult = false;
-    boolean result = instance.getTags().hasTagValue(1, 1);
+    boolean result = instance.getTags().hasTag(1, 1);
     assertEquals(expResult, result);
 
     part = new OSMMember(1L, OSMType.NODE, 1);
     instance = OSM.way(1L, 1, 1L, 1L, 1, new int[] {1, 1, 2, 3}, new OSMMember[] {part, part});
     expResult = true;
-    result = instance.getTags().hasTagValue(1, 1);
+    result = instance.getTags().hasTag(1, 1);
     assertEquals(expResult, result);
   }