gordonbanderson / Mappable

code/MapExtension.php

Doc Comments +1 added lines, -1 removed lines

@@ -204,7 +204,7 @@
     /**
      * Access the map editing field for the purpose of adding guide points.
      *
-     * @return [LatLongField] instance of location editing field
+     * @return FormField instance of location editing field
      */
     public function getMapField()
     {

tests/MapExtensionTest.php

Doc Comments +7 added lines

@@ -265,6 +265,10 @@ 
     /*
     Add a map layer to an existing instance
      */
+
+    /**
+     * @param Member $instance
+     */
     private function addLayerToInstance(&$instance)
     {
         // Create a layer
@@ -279,6 +283,9 @@ 
         $layers->add($layer);
     }
 
+    /**
+     * @param Member $instance
+     */
     private function addMapPinToInstance(&$instance)
     {
         // Create a pin

code/LatLongField.php

Indentation +2 added lines, -2 removed lines

@@ -65,7 +65,7 @@ 
             'data-LonFieldName' => $this->longField,
             'data-ZoomFieldName' => $this->zoomField,
             'data-UseMapBounds' => false,
-       );
+        );
 
         Requirements::css('mappable/css/mapField.css');
 
@@ -89,7 +89,7 @@ 
         $content = '<div class="editableMapWrapper">'.$this->create_tag(
             'div',
             $attributes
-       ).'</div>';
+        ).'</div>';
 
         $this->FieldList()->push(new LiteralField('locationEditor', $content));
 

Spacing +1 added lines, -2 removed lines

@@ -18,8 +18,7 @@
      * @param string[] $buttonText
      */
     public function __construct($children = array(), $buttonText = null)
-    {
-        ++self::$ctr;
+    {++self::$ctr;
 
         if ((sizeof($children) < 2) || (sizeof($children) > 3) ||
              (!$children[0] instanceof FormField) ||

code/MapUtil.php

Spacing +1 added lines, -2 removed lines

@@ -132,8 +132,7 @@
      * @return MapAPI
      */
     public static function instance()
-    {
-        ++self::$instances;
+    {++self::$instances;
 
         if (self::$allow_full_screen == null) {
             self::$allow_full_screen = Config::inst()->get('Mappable', 'allow_full_screen');

code/shortcodes/GoogleMapShortCodeHandler.php

Spacing +1 added lines, -2 removed lines

@@ -50,8 +50,7 @@
         // fullscreen
         $arguments['AllowFullScreen'] = Config::inst()->get('Mappable', 'allow_full_screen');
 
-        // 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);

code/shortcodes/GoogleStreetViewShortCodeHandler.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);

tests/LatLongFieldTest.php

Indentation +4 added lines, -4 removed lines

@@ -24,8 +24,8 @@ 
             $this->fail('Creation of lat long field should have failed');
         } catch (Exception $e) {
             $expected = 'LatLongField argument 1 must be an array containing at'
-                      .' least two FormField objects for Lat/Long values, resp'
-                      .'ectively.';
+                        .' least two FormField objects for Lat/Long values, resp'
+                        .'ectively.';
             $this->assertEquals($expected, $e->getMessage());
         }
     }
@@ -118,8 +118,8 @@ 
 
         $html = $mapField->FieldHolder();
         $expected = 'data-GuidePoints="[{"latitude":42,"longitude":"113.1&'
-                  .'quot;},{"latitude":14.9,"longitude":"113.2"},{&q'
-                  .'uot;latitude":42.3,"longitude":"113.4"}]"';
+                    .'quot;},{"latitude":14.9,"longitude":"113.2"},{&q'
+                    .'uot;latitude":42.3,"longitude":"113.4"}]"';
 
         $this->assertContains($expected, $html);
     }

tests/MapAPITest.php

Indentation +4 added lines, -4 removed lines

@@ -304,9 +304,9 @@ 
         $map = $this->getMapMultipleItems();
         $html = $map->forTemplate();
         $expected = 'data-mapmarkers=\'[{"latitude":23,"longitude":78,"html":"'
-                  .'MEMBER: Fred Bloggs","category":"default","icon":false},{"latitude'
-                  .'":-12,"longitude":42.1,"html":"MEMBER: Kane Williamson","category"'
-                  .':"default","icon":false}]\'';
+                    .'MEMBER: Fred Bloggs","category":"default","icon":false},{"latitude'
+                    .'":-12,"longitude":42.1,"html":"MEMBER: Kane Williamson","category"'
+                    .':"default","icon":false}]\'';
         $this->assertContains($expected, $html);
     }
 
@@ -338,7 +338,7 @@ 
     {
         $map = $this->getMap();
         $filepath = 'file://'.Director::baseFolder()
-                  .'/mappable/tests/kml/example.kml';
+                    .'/mappable/tests/kml/example.kml';
         $content = $map->getContent($filepath);
         $textHash = hash('ripemd160', $content);
         $fileHash = hash_file('ripemd160', $filepath);

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());
     }
 }