Adding getMetadata for Collection. Geez.

Author: Pol Dell'Aiera

lib/geometry/MultiLineString.class.php

@@ -15,5 +15,16 @@ public function isClosed() {
     }
     return TRUE;
   }
+
+  public function getMetadata($key, $options = array()) {
+    foreach ($this->components as $component) {
+      foreach ($component->metadata['providers'] as $metadata_provider) {
+        if ($metadata_provider->provides($key)) {
+          return $metadata_provider->get($this, $key, $options);
+        }
+      }
+      return NULL;
+    }
+  }
 }
 

lib/metadata/DurationMetadataProvider.class.php

@@ -9,24 +9,16 @@ public function provides($key) {
     return FALSE;
   }
 
-  public function has($target, $key) {
-    return isset($target->metadata['metadatas'][__CLASS__]) && isset($target->metadata['metadatas'][__CLASS__][$key]) && !is_null($target->metadata['metadatas'][__CLASS__][$key]) && (in_array($key, $this->capabilities)) && ($target instanceof Collection);
-  }
-
   public function get($target, $key, $options) {
 
     if ($target instanceof MultiLineString) {
-
-      if ($key == 'duration') {
-        $duration = 0;
-        foreach ($target->components as $component) {
-          $duration += $component->getMetadata('duration');
-        }
-        return $duration;
+      $duration = 0;
+      foreach ($target->components as $component) {
+        $duration += $component->getMetadata($key, $options);
       }
+      return $duration;
     }
 
-
     if ($target instanceof LineString) {
       if ($key == 'duration') {
         $point_a = $target->startPoint();

lib/metadata/ElevationMetadataProvider.class.php

@@ -9,12 +9,8 @@ public function provides($key) {
     return FALSE;
   }
 
-  public function has($target, $key) {
-    return isset($target->metadata['metadatas'][__CLASS__]) && isset($target->metadata['metadatas'][__CLASS__][$key]) && !is_null($target->metadata['metadatas'][__CLASS__][$key]) && ($key === 'ele') && ($target instanceof Point);
-  }
-
   public function get($target, $key, $options) {
-    if ($this->has($target, $key)) {
+    if ($this->provides($key)) {
       return $target->metadata['metadatas'][__CLASS__][$key];
     }
   }

lib/metadata/MetadataProvider.class.php

@@ -3,7 +3,6 @@
 interface MetadataProvider
 {
     public function provides($key);
-    public function has($target, $key);
     public function set($target, $key, $value);
     public function get($target, $key, $options);
     public function id();