Merge pull request #397 from plotly/add_geoplot_functionality_in_fig2plotly

Add geoplot functionality in fig2plotly

Author: gilbertogalvis

plotly/plotly_aux/plotly.m

@@ -57,7 +57,7 @@
     offline_given = true;
 end
 
-if ~offline_given
+if offline_given
     obj = plotlyfig(args, structargs);
     obj.layout.width = 840;
     obj.layout.height = 630;

plotly/plotlyfig.m

@@ -742,11 +742,13 @@ function validate(obj)
             % update annotations
             for n = 1:obj.State.Figure.NumTexts
                 try
-                    if ~obj.PlotOptions.is_headmap_axis
-                        updateAnnotation(obj,n);
-                    else
+                    if obj.PlotOptions.is_headmap_axis
                         updateHeatmapAnnotation(obj,n);
                         obj.PlotOptions.CleanFeedTitle = false;
+                    elseif obj.PlotlyDefaults.isGeoaxis
+                        % TODO    
+                    else
+                        updateAnnotation(obj,n);
                     end
                 catch
                     % TODO to the future

plotly/plotlyfig_aux/core/updateData.m

@@ -69,7 +69,11 @@
                     updateImage3D(obj, dataIndex);
                 end
             case 'line'
-                updateLineseries(obj, dataIndex);
+                if obj.PlotlyDefaults.isGeoaxis
+                    updateGeoPlot(obj, dataIndex);
+                else
+                    updateLineseries(obj, dataIndex);
+                end
             case 'categoricalhistogram'
                 updateCategoricalHistogram(obj, dataIndex); 
             case 'histogram'

plotly/plotlyfig_aux/handlegraphics/UpdateGeoAxes.m

@@ -46,7 +46,7 @@ function UpdateGeoAxes(obj, geoIndex)
 
     %-------------------------------------------------------------------------%
 
-    %-setting latitude axis
+    %-setting latitude axis-%
     latTick = geoData.LatitudeAxis.TickValues;
 
     geo.lataxis.range = geoData.LatitudeLimits;
@@ -61,7 +61,7 @@ function UpdateGeoAxes(obj, geoIndex)
 
     %-------------------------------------------------------------------------%
 
-    %-setting longitude axis
+    %-setting longitude axis-%
     lonTick = geoData.LongitudeAxis.TickValues;
 
     geo.lonaxis.range = geoData.LongitudeLimits;
@@ -75,10 +75,61 @@ function UpdateGeoAxes(obj, geoIndex)
     end
 
     %-------------------------------------------------------------------------%
+    
+    %-set map center-%
+    geo.center.lat = geoData.MapCenter(1);
+    geo.center.lon = geoData.MapCenter(2);
 
-    %-set geo axes to layout-%
+    %-------------------------------------------------------------------------%
+    
+    %-set better resolution-%
+    geo.resolution = '50';
+
+    %-------------------------------------------------------------------------%
 
+    %-set geo axes to layout-%
     obj.layout = setfield(obj.layout, sprintf('geo%d', xsource+1), geo);
 
     %-------------------------------------------------------------------------%
+
+    %-TEXT STTINGS-%
+    isText = false;
+    child = geoData.Children;
+    t = 1;
+
+    for n=1:length(child)
+        if strcmpi(child(n).Type, 'text')
+            isText = true;
+            texts{t} = child(t).String;
+            lats(t) = child(t).Position(1);
+            lons(t) = child(t).Position(2);
+            sizes(t) = child(t).FontSize;
+            families{t} = matlab2plotlyfont(child(t).FontName);
+            colors{t} = sprintf('rgb(%f,%f,%f)', child(t).Color);
+
+            if strcmpi(child(t).HorizontalAlignment, 'left')
+                pos{t} = 'right';
+            elseif strcmpi(child(t).HorizontalAlignment, 'right')
+                pos{t} = 'left';
+            else
+                pos{t} = child(t).HorizontalAlignment;
+            end
+
+            t = t + 1;
+        end
+    end
+
+    if isText
+        obj.data{geoIndex}.type = 'scattergeo';
+        obj.data{geoIndex}.mode = 'text';
+        obj.data{geoIndex}.text = texts;
+        obj.data{geoIndex}.lat = lats;
+        obj.data{geoIndex}.lon = lons;
+        obj.data{geoIndex}.geo = obj.data{geoIndex-1}.geo;
+
+        obj.data{geoIndex}.textfont.size = sizes;
+        obj.data{geoIndex}.textfont.color = colors;
+        obj.data{geoIndex}.textfont.family = families;
+        obj.data{geoIndex}.textposition = pos;
+    end
 end

plotly/plotlyfig_aux/handlegraphics/updateGeoPlot.m

@@ -0,0 +1,53 @@
+function updateGeoPlot(obj,geoIndex)
+
+    %-AXIS INDEX-%
+    axIndex = obj.getAxisIndex(obj.State.Plot(geoIndex).AssociatedAxis);
+
+    %-GET STRUCTURES-%
+    geoData = get(obj.State.Plot(geoIndex).Handle);
+    axisData = geoData.Parent;
+    figureData = get(obj.State.Figure.Handle);
+
+    %-CHECK FOR MULTIPLE AXES-%
+    [xsource, ysource] = findSourceAxis(obj,axIndex);
+
+    %-ASSOCIATE GEO-AXES LAYOUT-%
+    obj.data{geoIndex}.geo = sprintf('geo%d', xsource+1);
+
+    %-------------------------------------------------------------------------%
+
+    %-set scattergeo type-%
+    obj.data{geoIndex}.type = 'scattergeo';
+
+    %-------------------------------------------------------------------------%
+
+    %-set scattergeo mode-%
+    obj.data{geoIndex}.mode = 'lines+markers';
+
+    %-------------------------------------------------------------------------%
+
+    %-set plot data-%    
+    obj.data{geoIndex}.lat = geoData.LatitudeData;
+    obj.data{geoIndex}.lon = geoData.LongitudeData;
+
+    %-------------------------------------------------------------------------%
+
+    %-get marker setting-%
+    [marker, linee] = extractGeoLinePlusMarker(geoData, axisData);
+
+    %-------------------------------------------------------------------------%
+
+    %-set marker field-%
+    obj.data{geoIndex}.marker = marker;
+
+    if strcmpi(geoData.Marker, 'none')
+        obj.data{geoIndex}.mode = 'lines';
+    end
+
+    %-------------------------------------------------------------------------%
+
+    %-set line field-%
+    obj.data{geoIndex}.line = linee;
+
+    %-------------------------------------------------------------------------%
+end

plotly/plotlyfig_aux/handlegraphics/updateWordcloud.m

@@ -123,7 +123,7 @@ function updateWordcloud(obj,scatterIndex)
 %-------------------------------------------------------------------------%
 
 %-det font family-%
-obj.data{scatterIndex}.textfont.family = matlab2plotlyfont(scatter_data.FontName);;
+obj.data{scatterIndex}.textfont.family = matlab2plotlyfont(scatter_data.FontName);
 
 %-------------------------------------------------------------------------%