Changeset 16319
- Timestamp:
- 03/16/09 01:39:21 (4 years ago)
- Files:
-
- plugins/sfEasyGMapPlugin/trunk/lib/GMap.class.php (modified) (20 diffs)
- plugins/sfEasyGMapPlugin/trunk/lib/GMapEvent.class.php (modified) (5 diffs)
- plugins/sfEasyGMapPlugin/trunk/lib/GMapGeocodedAddress.class.php (modified) (12 diffs)
- plugins/sfEasyGMapPlugin/trunk/lib/GMapIcon.class.php (modified) (6 diffs)
- plugins/sfEasyGMapPlugin/trunk/lib/GMapMarker.class.php (modified) (9 diffs)
- plugins/sfEasyGMapPlugin/trunk/package.xml (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
plugins/sfEasyGMapPlugin/trunk/lib/GMap.class.php
r16301 r16319 73 73 /** 74 74 * Sets the Google Map API Key using the array_google_keys defined in the app.yml of your application 75 * @param String $domain The domaine name75 * @param string $domain The domaine name 76 76 * @author Fabrice 77 77 * … … 84 84 /** 85 85 * Guesses the GoogleMap key for the current domain 86 * @return String $api_key86 * @return string $api_key 87 87 * @author Fabrice 88 88 * … … 133 133 /** 134 134 * Geocodes an address 135 * @param String $address135 * @param string $address 136 136 * @return GMapGeocodedAddress 137 137 * @author Fabrice Bernhard … … 146 146 /** 147 147 * Geocodes an address and returns additional normalized information 148 * @param String $address148 * @param string $address 149 149 * @return GMapGeocodedAddress 150 150 * @author Fabrice Bernhard … … 159 159 160 160 /** 161 * @return String $this->options['js_name'] Javascript name of the googlemap161 * @return string $this->options['js_name'] Javascript name of the googlemap 162 162 */ 163 163 public function getJsName() … … 169 169 /** 170 170 * Sets the Google Maps API key 171 * @param String $key171 * @param string $key 172 172 */ 173 173 public function setAPIKey($key) … … 177 177 /** 178 178 * Gets the Google Maps API key 179 * @return String $key179 * @return string $key 180 180 */ 181 181 public function getAPIKey() … … 195 195 /** 196 196 * Defines one style of the div container 197 * @param String $style_tag name of css tag198 * @param String $style_value value of css tag197 * @param string $style_tag name of css tag 198 * @param string $style_value value of css tag 199 199 */ 200 200 public function setContainerStyle($style_tag,$style_value) … … 213 213 /* 214 214 * Gets one style of the Google Map div 215 * @param String $style_tag name of css tag215 * @param string $style_tag name of css tag 216 216 */ 217 217 public function getContainerStyle($style_tag) … … 230 230 * returns the Html for the Google map container 231 231 * @param Array $options Style options of the HTML container 232 * @return String $container232 * @return string $container 233 233 * @author Fabrice Bernhard 234 234 */ … … 315 315 /** 316 316 * returns the URLS for the google map Javascript file 317 * @return String $js_url317 * @return string $js_url 318 318 */ 319 319 public function getGoogleJsUrl() … … 335 335 * Retourne l'objet GMapIcon à partir du nom de l'icone 336 336 * 337 * @param String $name337 * @param string $name 338 338 * @return GMapIcon 339 339 * … … 381 381 /** 382 382 * Returns the javascript string which defines the icons 383 * @return String383 * @return string 384 384 */ 385 385 public function getIconsJs() … … 395 395 /** 396 396 * Returns the javascript string which defines the markers 397 * @return String397 * @return string 398 398 */ 399 399 public function getMarkersJs() … … 412 412 /* 413 413 * Returns the javascript string which defines events linked to the map 414 * @return String414 * @return string 415 415 */ 416 416 public function getEventsJs() … … 427 427 /* 428 428 * Gets the Code to execute after Js initialization 429 * @return String $after_init_js429 * @return string $after_init_js 430 430 */ 431 431 public function getAfterInitJs() … … 435 435 /* 436 436 * Sets the Code to execute after Js initialization 437 * @param String $after_init_js Code to execute437 * @param string $after_init_js Code to execute 438 438 */ 439 439 public function addAfterInitJs($after_init_js) … … 454 454 * Sets the center of the map at the beginning 455 455 * 456 * @param Decimal$lat457 * @param Decimal$lng456 * @param integer $lat 457 * @param integer $lng 458 458 */ 459 459 public function setCenter($lat=null,$lng=null) … … 484 484 485 485 /** 486 * Returns the url for a static version of the map (when javascript is not active) 487 * Supports only markers and basic parameters: centre, zoom, size 488 * 486 * Returns the URL of a static version of the map (when JavaScript is not active) 487 * Supports only markers and basic parameters: center, zoom, size. 489 488 * @param string $map_type = 'mobile' 490 489 * @param string $hl Language (fr, en...) 491 * @return string U rl of the picture490 * @return string URL of the image 492 491 * @author Laurent Bachelier 493 492 */ … … 514 513 /** 515 514 * Returns the static code to create markers 516 * @return String515 * @return string 517 516 * @author Laurent Bachelier 518 517 */ plugins/sfEasyGMapPlugin/trunk/lib/GMapEvent.class.php
r11741 r16319 14 14 15 15 /** 16 * @param String $trigger action that will trigger the event17 * @param String $function the javascript function to be executed18 * @param String $encapsulate_function16 * @param string $trigger action that will trigger the event 17 * @param string $function the javascript function to be executed 18 * @param string $encapsulate_function 19 19 * @author Fabrice Bernhard 20 20 */ … … 27 27 28 28 /** 29 * @return String $trigger action that will trigger the event29 * @return string $trigger action that will trigger the event 30 30 */ 31 31 public function getTrigger() … … 35 35 } 36 36 /** 37 * @return String $function the javascript function to be executed37 * @return string $function the javascript function to be executed 38 38 */ 39 39 public function getFunction() … … 54 54 * returns the javascript code for attaching a Google event to a javascript_object 55 55 * 56 * @param String $js_object_name57 * @return String56 * @param string $js_object_name 57 * @return string 58 58 * @author Fabrice Bernhard 59 59 */ … … 67 67 * returns the javascript code for attaching a dom event to a javascript_object 68 68 * 69 * @param String $js_object_name70 * @return String69 * @param string $js_object_name 70 * @return string 71 71 * @author Fabrice Bernhard 72 72 */ plugins/sfEasyGMapPlugin/trunk/lib/GMapGeocodedAddress.class.php
r12104 r16319 22 22 * Constructs a gMapGeocodedAddress object from a given $raw_address String 23 23 * 24 * @param String $raw_address24 * @param string $raw_address 25 25 * @author Fabrice Bernhard 26 26 */ … … 33 33 * Geocodes the address using the Google Maps CSV webservice 34 34 * 35 * @param String $api_key36 * @return Integer $accuracy35 * @param string $api_key 36 * @return integer $accuracy 37 37 * @author Fabrice Bernhard 38 38 */ … … 57 57 * Geocodes the address using the Google Maps XML webservice, which has more information. 58 58 * Unknown values will be set to NULL. 59 * @param String $api_key60 * @return Integer $accuracy59 * @param string $api_key 60 * @return integer $accuracy 61 61 * @author Fabrice Bernhard 62 62 */ … … 104 104 /** 105 105 * Returns the latitude 106 * @return Decimal$latitude106 * @return integer $latitude 107 107 */ 108 108 public function getLat() … … 114 114 /** 115 115 * Returns the longitude 116 * @return Decimal$longitude116 * @return integer $longitude 117 117 */ 118 118 public function getLng() … … 124 124 /** 125 125 * Returns the Geocoding accuracy 126 * @return Integer $accuracy126 * @return integer $accuracy 127 127 */ 128 128 public function getAccuracy() … … 134 134 /** 135 135 * Returns the address normalized by the Google Maps web service 136 * @return String $geocoded_address136 * @return string $geocoded_address 137 137 */ 138 138 public function getGeocodedAddress() … … 144 144 /** 145 145 * Returns the city normalized by the Google Maps web service 146 * @return String $geocoded_city146 * @return string $geocoded_city 147 147 */ 148 148 public function getGeocodedCity() … … 154 154 /** 155 155 * Returns the country code normalized by the Google Maps web service 156 * @return String $geocoded_country_code156 * @return string $geocoded_country_code 157 157 */ 158 158 public function getGeocodedCountryCode() … … 164 164 /** 165 165 * Returns the country normalized by the Google Maps web service 166 * @return String $geocoded_country166 * @return string $geocoded_country 167 167 */ 168 168 public function getGeocodedCountry() … … 174 174 /** 175 175 * Returns the postal code normalized by the Google Maps web service 176 * @return String $geocoded_postal_code176 * @return string $geocoded_postal_code 177 177 */ 178 178 public function getGeocodedPostalCode() … … 184 184 /** 185 185 * Returns the street name normalized by the Google Maps web service 186 * @return String $geocoded_country_code186 * @return string $geocoded_country_code 187 187 */ 188 188 public function getGeocodedStreet() plugins/sfEasyGMapPlugin/trunk/lib/GMapIcon.class.php
r11741 r16319 35 35 /** 36 36 * Set Icon's path 37 * @param String $icon_src Icon's path37 * @param string $icon_src Icon's path 38 38 */ 39 39 public function setIconSrc($icon_src) … … 43 43 /** 44 44 * Get Icon's path 45 * @return String45 * @return string 46 46 */ 47 47 public function getIconSrc() … … 52 52 /** 53 53 * Set Shadow's path 54 * @param String $shadow_src Shadow's path54 * @param string $shadow_src Shadow's path 55 55 */ 56 56 public function setShadowSrc($shadow_src) … … 68 68 /** 69 69 * Get Icon's Javascript variable's name 70 * @return String $name70 * @return string $name 71 71 */ 72 72 public function getName() … … 77 77 /** 78 78 * Change Icon's JavaScript name 79 * @param String $name79 * @param string $name 80 80 */ 81 81 public function setName($name) … … 95 95 * Returns the javascript code tthat defines an icon 96 96 * 97 * @return String97 * @return string 98 98 */ 99 99 public function getIconJs() plugins/sfEasyGMapPlugin/trunk/lib/GMapMarker.class.php
r16301 r16319 17 17 18 18 /** 19 * @param String $js_name Javascript name of the marker20 * @param Decimal$lat Latitude21 * @param Decimal$lng Longitude19 * @param string $js_name Javascript name of the marker 20 * @param integer $lat Latitude 21 * @param integer $lng Longitude 22 22 * @param GMapIcon $icon 23 23 * @param GmapEvent[] array of GoogleMap Events linked to the marker … … 36 36 * Construct from a GMapGeocodedAddress object 37 37 * 38 * @param String $js_name38 * @param string $js_name 39 39 * @param GMapGeocodedAddress $gmap_geocoded_address 40 40 * @return GMapMarker … … 51 51 52 52 /** 53 * @return String $js_name Javascript name of the marker53 * @return string $js_name Javascript name of the marker 54 54 */ 55 55 public function getName() … … 66 66 } 67 67 /** 68 * @return Decimal$lat Javascript latitude68 * @return integer $lat Javascript latitude 69 69 */ 70 70 public function getLat() … … 74 74 } 75 75 /** 76 * @return Decimal$lng Javascript longitude76 * @return integer $lng Javascript longitude 77 77 */ 78 78 public function getLng() … … 93 93 } 94 94 /** 95 * @return String Javascript code to create the marker95 * @return string Javascript code to create the marker 96 96 * @author Fabrice Bernhard 97 97 */ … … 133 133 * Adds an onlick listener that open a html window with some text 134 134 * 135 * @param String $html_text135 * @param string $html_text 136 136 * @author fabriceb 137 137 * @since Feb 20, 2009 fabriceb removed the escape_javascript function which made the plugin incompatible with symfony 1.2 … … 148 148 * Returns the code for the static version of Google Maps 149 149 * @TODO Add support for color and alpha-char 150 * @author laurentb 150 * @author Laurent Bachelier 151 * @return string 151 152 */ 152 153 public function getMarkerStatic() … … 167 168 * Sets a custom property to the generated javascript object 168 169 * 169 * @param String $name170 * @param String $value170 * @param string $name 171 * @param string $value 171 172 */ 172 173 public function setCustomProperty($name,$value) plugins/sfEasyGMapPlugin/trunk/package.xml
r16304 r16319 6 6 <description>The sfEasyGMap plugin provides helpers and an objet-oriented PHP abstraction to the Google Maps API to ease the process of adding a Google Map and customising it in your symfony projects.</description> 7 7 <lead> 8 <name>Fabrice B ERNHARD</name>8 <name>Fabrice Bernhard</name> 9 9 <user>fabriceb</user> 10 10 <email>fabriceb@allomatch.com</email> 11 11 <active>yes</active> 12 12 </lead> 13 <contributor> 14 <name>Laurent BACHELIER</name> 13 <developer> 14 <name>Vincent Guillon</name> 15 <user>vincentg</user> 16 <email>vincentg@allomatch</email> 17 <active>yes</active> 18 </developer> 19 <developer> 20 <name>Laurent Bachelier</name> 15 21 <user>laurentb</user> 16 22 <email>laurent@bachelier.name</email> 17 23 <active>yes</active> 18 </ contributor>24 </developer> 19 25 <date>2009-03-13</date> 20 26 <time>16:00:00</time>