T6 Changes to Map Indicators

application/config/map.php

@@ -9,7 +9,7 @@
  * Values from 1 to 10
  * Default: 4
  */
-$config['marker_radius'] = "4";
+$config['marker_radius'] = "2.5";
 
 
 /**

application/controllers/json.php

@@ -94,6 +94,7 @@ protected function geojson($type)
 
 		// Category ID
 		$category_id = (isset($_GET['c']) AND intval($_GET['c']) > 0) ? intval($_GET['c']) : 0;
+
 		// Get the category colour
 		if (Category_Model::is_valid_category($category_id))
 		{
@@ -226,7 +227,7 @@ protected function markers_geojson($incidents, $category_id, $color, $icon, $inc
 				$link = Incident_Model::get_url($marker);
 			}
 			$item_name = $this->get_title($marker->incident_title, $link);
-
+			if ($category_id == 0) { $color=$this->get_color($category_id); } else { $color=$color;}
 			$json_item = array();
 			$json_item['type'] = 'Feature';
 			$json_item['properties'] = array(
@@ -874,4 +875,19 @@ protected function get_title($title, $url)
 		$item_name = str_replace(array(chr(10),chr(13)), ' ', $item_name);
 		return $item_name;
 	}
+
+	/**
+	 * Get encoded title linked to url
+	 * @param $category_id
+	 * @return $color1
+	 */
+	protected function get_color($category_id)
+	{
+		if ($category_id == 0) 
+		{
+			$cat = ORM::factory('category', $category_id=1);
+                        $color = $cat->category_color;	
+		}
+		return $color;
+	}
 }