| Index: trunk/extensions/SemanticMaps/FormInputs/SM_FormInputs.php |
| — | — | @@ -57,29 +57,26 @@ |
| 58 | 58 | self::$parameters = array( |
| 59 | 59 | 'centre' => array( |
| 60 | 60 | 'aliases' => array('center'), |
| 61 | | - 'criteria' => array(), |
| 62 | 61 | 'default' => $egMapsDefaultCentre |
| 63 | 62 | ), |
| 64 | 63 | 'service' => array( |
| 65 | | - 'aliases' => array(), |
| 66 | 64 | 'criteria' => array( |
| 67 | 65 | 'in_array' => $egMapsAvailableServices |
| 68 | 66 | ), |
| 69 | 67 | 'default' => $egMapsDefaultServices['fi'] |
| 70 | 68 | ), |
| 71 | 69 | 'geoservice' => array( |
| 72 | | - 'aliases' => array(), |
| 73 | 70 | 'criteria' => array( |
| 74 | 71 | 'in_array' => array_keys($egMapsAvailableGeoServices) |
| 75 | 72 | ), |
| 76 | 73 | 'default' => $egMapsDefaultGeoService |
| 77 | 74 | ), |
| 78 | | - 'service_name' => array('default' => ''), |
| 79 | | - 'part_of_multiple' => array('default' => ''), |
| 80 | | - 'possible_values' => array('default' => ''), |
| 81 | | - 'is_list' => array('default' => ''), |
| 82 | | - 'semantic_property' => array('default' => ''), |
| 83 | | - 'value_labels' => array('default' => ''), |
| | 75 | + 'service_name' => array(), |
| | 76 | + 'part_of_multiple' => array(), |
| | 77 | + 'possible_values' => array(), |
| | 78 | + 'is_list' => array(), |
| | 79 | + 'semantic_property' => array(), |
| | 80 | + 'value_labels' => array(), |
| 84 | 81 | ); |
| 85 | 82 | } |
| 86 | 83 | |
| Index: trunk/extensions/SemanticMaps/SemanticMaps.php |
| — | — | @@ -25,7 +25,7 @@ |
| 26 | 26 | |
| 27 | 27 | // Only initialize the extension when all dependencies are present. |
| 28 | 28 | if (defined( 'Maps_VERSION' ) && defined( 'SMW_VERSION' )) { |
| 29 | | - define('SM_VERSION', '0.5 a20'); |
| | 29 | + define('SM_VERSION', '0.5 a21'); |
| 30 | 30 | |
| 31 | 31 | $smgScriptPath = $wgScriptPath . '/extensions/SemanticMaps'; |
| 32 | 32 | $smgIP = $IP . '/extensions/SemanticMaps'; |
| Index: trunk/extensions/SemanticMaps/QueryPrinters/SM_QueryPrinters.php |
| — | — | @@ -52,20 +52,16 @@ |
| 53 | 53 | |
| 54 | 54 | self::$parameters = array( |
| 55 | 55 | 'geoservice' => array( |
| 56 | | - 'aliases' => array(), |
| 57 | 56 | 'criteria' => array( |
| 58 | 57 | 'in_array' => array_keys($egMapsAvailableGeoServices) |
| 59 | 58 | ), |
| 60 | 59 | 'default' => $egMapsDefaultGeoService |
| 61 | 60 | ), |
| 62 | 61 | 'format' => array( |
| 63 | | - 'aliases' => array(), |
| 64 | | - 'criteria' => array(), |
| 65 | 62 | 'default' => $egMapsDefaultServices['qp'] |
| 66 | 63 | ), |
| 67 | 64 | 'centre' => array( |
| 68 | 65 | 'aliases' => array('center'), |
| 69 | | - 'criteria' => array(), |
| 70 | 66 | 'default' => $egMapsDefaultCentre |
| 71 | 67 | ), |
| 72 | 68 | ); |
| Index: trunk/extensions/SemanticMaps/GoogleMaps/SM_GoogleMapsQP.php |
| — | — | @@ -36,10 +36,11 @@ |
| 37 | 37 | 'default' => '', |
| 38 | 38 | ), |
| 39 | 39 | 'overlays' => array( |
| 40 | | - 'aliases' => array(), |
| 41 | | - 'criteria' => array(), |
| 42 | | - 'default' => '' |
| 43 | | - ), |
| | 40 | + 'type' => 'list-string', |
| | 41 | + 'criteria' => array( |
| | 42 | + 'all_in_array' => MapsGoogleMaps::getOverlayNames() |
| | 43 | + ), |
| | 44 | + ), |
| 44 | 45 | ); |
| 45 | 46 | } |
| 46 | 47 | |
| Index: trunk/extensions/SemanticMaps/GoogleMaps/SM_GoogleMapsFormInput.php |
| — | — | @@ -31,15 +31,7 @@ |
| 32 | 32 | |
| 33 | 33 | $this->earthZoom = 1; |
| 34 | 34 | |
| 35 | | - $this->defaultZoom = $egMapsGoogleMapsZoom; |
| 36 | | - |
| 37 | | - $this->spesificParameters = array( |
| 38 | | - 'overlays' => array( |
| 39 | | - 'aliases' => array(), |
| 40 | | - 'criteria' => array(), |
| 41 | | - 'default' => '' |
| 42 | | - ), |
| 43 | | - ); |
| | 35 | + $this->defaultZoom = $egMapsGoogleMapsZoom; |
| 44 | 36 | } |
| 45 | 37 | |
| 46 | 38 | /** |
| — | — | @@ -86,6 +78,7 @@ |
| 87 | 79 | |
| 88 | 80 | $this->controls = MapsMapper::createJSItemsString(explode(',', $this->controls)); |
| 89 | 81 | |
| | 82 | + // Remove the overlays control in case it's present. |
| 90 | 83 | if (in_string('overlays', $this->controls)) { |
| 91 | 84 | $this->controls = str_replace(",'overlays'", '', $this->controls); |
| 92 | 85 | $this->controls = str_replace("'overlays',", '', $this->controls); |