| Index: trunk/extensions/SemanticMaps/Services/YahooMaps/SM_YahooMapsFormInput.php |
| — | — | @@ -60,7 +60,7 @@ |
| 61 | 61 | /** |
| 62 | 62 | * @see MapsMapFeature::addSpecificMapHTML |
| 63 | 63 | */ |
| 64 | | - protected function addSpecificMapHTML() { |
| | 64 | + public function addSpecificMapHTML() { |
| 65 | 65 | global $wgOut; |
| 66 | 66 | |
| 67 | 67 | $mapName = $this->service->getMapId( false ); |
| Index: trunk/extensions/SemanticMaps/Services/OpenLayers/SM_OpenLayersFormInput.php |
| — | — | @@ -50,7 +50,7 @@ |
| 51 | 51 | /** |
| 52 | 52 | * @see MapsMapFeature::addSpecificMapHTML |
| 53 | 53 | */ |
| 54 | | - protected function addSpecificMapHTML() { |
| | 54 | + public function addSpecificMapHTML() { |
| 55 | 55 | global $wgOut, $wgLang; |
| 56 | 56 | |
| 57 | 57 | $mapName = $this->service->getMapId( false ); |
| Index: trunk/extensions/SemanticMaps/Services/GoogleMaps/SM_GoogleMapsFormInput.php |
| — | — | @@ -63,7 +63,7 @@ |
| 64 | 64 | /** |
| 65 | 65 | * @see MapsMapFeature::addSpecificFormInputHTML |
| 66 | 66 | */ |
| 67 | | - protected function addSpecificMapHTML() { |
| | 67 | + public function addSpecificMapHTML() { |
| 68 | 68 | global $wgOut; |
| 69 | 69 | |
| 70 | 70 | $mapName = $this->service->getMapId( false ); |
| Index: trunk/extensions/SemanticMaps/Features/FormInputs/SM_FormInput.php |
| — | — | @@ -39,6 +39,8 @@ |
| 40 | 40 | |
| 41 | 41 | protected $specificParameters = false; |
| 42 | 42 | |
| | 43 | + protected $coordsFieldName; |
| | 44 | + |
| 43 | 45 | private $coordinates; |
| 44 | 46 | |
| 45 | 47 | /** |
| — | — | @@ -99,7 +101,7 @@ |
| 100 | 102 | */ |
| 101 | 103 | $parameterInfo = array_merge_recursive( MapsMapper::getCommonParameters(), SMFormInputs::$parameters ); |
| 102 | 104 | $parameterInfo = array_merge_recursive( $parameterInfo, $this->service->getParameterInfo() ); |
| 103 | | - $parameterInfo = array_merge_recursive( $parameterInfo, $this->specificParameters ); |
| | 105 | + $parameterInfo = array_merge_recursive( $parameterInfo, $this->getSpecificParameterInfo() ); |
| 104 | 106 | |
| 105 | 107 | $manager = new ValidatorManager(); |
| 106 | 108 | |
| — | — | @@ -137,8 +139,6 @@ |
| 138 | 140 | |
| 139 | 141 | $this->coordinates = $coordinates; |
| 140 | 142 | |
| 141 | | - $this->setMapSettings(); |
| 142 | | - |
| 143 | 143 | $showInput = $this->setMapProperties( $field_args ); |
| 144 | 144 | |
| 145 | 145 | if ( !$showInput ) { |
| — | — | @@ -151,7 +151,7 @@ |
| 152 | 152 | |
| 153 | 153 | // Create html element names. |
| 154 | 154 | $mapName = $this->service->getMapId(); |
| 155 | | - $coordsFieldName = $mapName . '_coords_' . $sfgTabIndex; |
| | 155 | + $this->coordsFieldName = $mapName . '_coords_' . $sfgTabIndex; |
| 156 | 156 | $infoFieldName = $mapName . '_info_' . $sfgTabIndex; |
| 157 | 157 | |
| 158 | 158 | $geocodingFunction = $this->getShowAddressFunction(); |
| — | — | @@ -164,7 +164,7 @@ |
| 165 | 165 | array( |
| 166 | 166 | 'size' => 42, #_O |
| 167 | 167 | 'tabindex' => $sfgTabIndex, |
| 168 | | - 'id' => $coordsFieldName |
| | 168 | + 'id' => $this->coordsFieldName |
| 169 | 169 | ) |
| 170 | 170 | ); |
| 171 | 171 | |
| — | — | @@ -236,7 +236,7 @@ |
| 237 | 237 | $notFoundText = Xml::escapeJsString( wfMsg( 'semanticmaps_notfound' ) ); |
| 238 | 238 | $mapName = Xml::escapeJsString( $mapName ); |
| 239 | 239 | $geoFieldName = Xml::escapeJsString( $geocodeFieldName ); |
| 240 | | - $coordFieldName = Xml::escapeJsString( $geocodeFieldName ); |
| | 240 | + $coordFieldName = Xml::escapeJsString( $this->coordsFieldName ); |
| 241 | 241 | |
| 242 | 242 | $this->output .= '<p>' . $adressField . |
| 243 | 243 | Html::input( |