JSON::markers_geojson() - Get URLs from object or Incident helper fn u…

…shahidi#853

Allows plugins to pass markers with their own url attribute or method

application/controllers/json.php

@@ -188,7 +188,19 @@ protected function markers_geojson($incidents, $category_id, $color, $icon, $inc
 				}
 			}
 
-			$link = url::site("reports/view/".$marker->id);
+			// Get URL from object, fallback to Incident_Model::get() if object doesn't have url or url()
+			if (method_exists($marker, 'url'))
+			{
+				$link = $marker->url();
+			}
+			elseif (isset($marker->url))
+			{
+				$link = $marker->url;
+			}
+			else
+			{
+				$link = Incident_Model::get_url($marker);
+			}
 			$item_name = $this->get_title($marker->incident_title, $link);
 
 			$json_item = array();