gordonbanderson / Mappable

tests/MapFieldTest.php

Indentation +4 added lines, -4 removed lines

@@ -7,8 +7,8 @@ 
         //$headingLevel = 2, $allowHTML = false, $form = nul
         $field = new MapField('NameOfField', 'TitleOfField');
         $expected = '<div class="editableMap"><div class="middleColumn" id="Nam'
-                  .'eOfField" style="width:100%;height:300px;margin:5px 0px 5p'
-                  .'x 5px;position:relative;"></div></div>';
+                    .'eOfField" style="width:100%;height:300px;margin:5px 0px 5p'
+                    .'x 5px;position:relative;"></div></div>';
         $this->assertEquals($expected, $field->Field());
     }
 
@@ -17,8 +17,8 @@ 
         //$headingLevel = 2, $allowHTML = false, $form = nul
         $field = new MapField('NameOfField');
         $expected = '<div class="editableMap"><div class="middleColumn" id="Nam'
-                  .'eOfField" style="width:100%;height:300px;margin:5px 0px 5p'
-                  .'x 5px;position:relative;"></div></div>';
+                    .'eOfField" style="width:100%;height:300px;margin:5px 0px 5p'
+                    .'x 5px;position:relative;"></div></div>';
         $this->assertEquals($expected, $field->Field());
     }
 }

tests/MappableDataTest.php

Indentation +24 added lines, -24 removed lines

@@ -99,9 +99,9 @@ 
         $instance->Lon = 100.52;
         $html = $instance->StaticMap(300, 800);
         $expected = '<img src="//maps.googleapis.com/maps/api/staticmap?center='
-                  .'13.84%2C100.52&amp;markers=13.84%2C100.52'
-                  .'&amp;zoom=13&amp;size=300x800&amp;sensor=false&amp;mapt'
-                  .'ype=roadmap" width="300" height="800" alt="User" />';
+                    .'13.84%2C100.52&amp;markers=13.84%2C100.52'
+                    .'&amp;zoom=13&amp;size=300x800&amp;sensor=false&amp;mapt'
+                    .'ype=roadmap" width="300" height="800" alt="User" />';
         $this->assertEquals($expected, $html);
     }
 
@@ -112,16 +112,16 @@ 
         $instance->Lon = 100.5005558;
         $html = $instance->StaticMap(300, 800);
         $expected = '<img src="//maps.googleapis.com/maps/api/staticmap?center='
-                  .'13.8188931%2C100.5005558&amp;markers=13.8188931%2C100.5005'
-                  .'558&amp;zoom=13&amp;size=300x800&amp;sensor=false&amp;mapt'
-                  .'ype=roadmap" width="300" height="800" alt="User" />';
+                    .'13.8188931%2C100.5005558&amp;markers=13.8188931%2C100.5005'
+                    .'558&amp;zoom=13&amp;size=300x800&amp;sensor=false&amp;mapt'
+                    .'ype=roadmap" width="300" height="800" alt="User" />';
         $this->assertEquals($expected, $html);
 
         $html = $instance->StaticMap(310, 810);
         $expected = '<img src="//maps.googleapis.com/maps/api/staticmap?center='
-                  .'13.8188931%2C100.5005558&amp;markers=13.8188931%2C100.5005'
-                  .'558&amp;zoom=13&amp;size=310x810&amp;sensor=false&amp;mapt'
-                  .'ype=roadmap" width="310" height="810" alt="User" />';
+                    .'13.8188931%2C100.5005558&amp;markers=13.8188931%2C100.5005'
+                    .'558&amp;zoom=13&amp;size=310x810&amp;sensor=false&amp;mapt'
+                    .'ype=roadmap" width="310" height="810" alt="User" />';
         $this->assertEquals($expected, $html);
     }
 
@@ -132,22 +132,22 @@ 
         $instance->Lon = 100.5005558;
         $html = $instance->StaticMap(300, 800, null, 'satellite');
         $expected = '<img src="//maps.googleapis.com/maps/api/staticmap?center='
-                  .'13.8188931%2C100.5005558&amp;markers=13.8188931%2C100.5005'
-                  .'558&amp;zoom=13&amp;size=300x800&amp;sensor=false&amp;mapt'
-                  .'ype=satellite" width="300" height="800" alt="User" />';
+                    .'13.8188931%2C100.5005558&amp;markers=13.8188931%2C100.5005'
+                    .'558&amp;zoom=13&amp;size=300x800&amp;sensor=false&amp;mapt'
+                    .'ype=satellite" width="300" height="800" alt="User" />';
         $this->assertEquals($expected, $html);
 
         $html = $instance->StaticMap(300, 800, null, 'terrain');
         $expected = '<img src="//maps.googleapis.com/maps/api/staticmap?center='
-                  .'13.8188931%2C100.5005558&amp;markers=13.8188931%2C100.5005'
-                  .'558&amp;zoom=13&amp;size=300x800&amp;sensor=false&amp;mapt'
-                  .'ype=terrain" width="300" height="800" alt="User" />';
+                    .'13.8188931%2C100.5005558&amp;markers=13.8188931%2C100.5005'
+                    .'558&amp;zoom=13&amp;size=300x800&amp;sensor=false&amp;mapt'
+                    .'ype=terrain" width="300" height="800" alt="User" />';
 
         $html = $instance->StaticMap(300, 800, null, 'hybrid');
         $expected = '<img src="//maps.googleapis.com/maps/api/staticmap?center='
-                  .'13.8188931%2C100.5005558&amp;markers=13.8188931%2C100.5005'
-                  .'558&amp;zoom=13&amp;size=300x800&amp;sensor=false&amp;mapt'
-                  .'ype=hybrid" width="300" height="800" alt="User" />';
+                    .'13.8188931%2C100.5005558&amp;markers=13.8188931%2C100.5005'
+                    .'558&amp;zoom=13&amp;size=300x800&amp;sensor=false&amp;mapt'
+                    .'ype=hybrid" width="300" height="800" alt="User" />';
         $this->assertEquals($expected, $html);
     }
 
@@ -157,16 +157,16 @@ 
 
         $html = $instance->StaticMap(300, 800, 2);
         $expected = '<img src="//maps.googleapis.com/maps/api/staticmap?center='
-                  .'13.8188931%2C100.5005558&amp;markers=13.8188931%2C100.5005'
-                  .'558&amp;zoom=2&amp;size=300x800&amp;sensor=false&amp;mapt'
-                  .'ype=roadmap" width="300" height="800" alt="User" />';
+                    .'13.8188931%2C100.5005558&amp;markers=13.8188931%2C100.5005'
+                    .'558&amp;zoom=2&amp;size=300x800&amp;sensor=false&amp;mapt'
+                    .'ype=roadmap" width="300" height="800" alt="User" />';
         $this->assertEquals($expected, $html);
 
         $html = $instance->StaticMap(300, 800, 12);
         $expected = '<img src="//maps.googleapis.com/maps/api/staticmap?center='
-                  .'13.8188931%2C100.5005558&amp;markers=13.8188931%2C100.5005'
-                  .'558&amp;zoom=12&amp;size=300x800&amp;sensor=false&amp;mapt'
-                  .'ype=roadmap" width="300" height="800" alt="User" />';
+                    .'13.8188931%2C100.5005558&amp;markers=13.8188931%2C100.5005'
+                    .'558&amp;zoom=12&amp;size=300x800&amp;sensor=false&amp;mapt'
+                    .'ype=roadmap" width="300" height="800" alt="User" />';
         $this->assertEquals($expected, $html);
     }
 

code/shortcodes/GoogleMapShortCodeHandler.php

Spacing +1 added lines, -2 removed lines

@@ -53,8 +53,7 @@
         // the id of the dom element to be used to render the street view
         $arguments['DomID'] = 'google_streetview_'.self::$gsv_ctr;
 
-        // incrememt the counter to ensure a unique id for each map canvas
-        ++self::$gsv_ctr;
+        // incrememt the counter to ensure a unique id for each map canvas++self::$gsv_ctr;
 
         // merge defaults and arguments
         $customised = array_merge($defaults, $arguments);