Skip to content

add geoRenderType optional paramter to geoscatter geoplot and geobubble functionalities #400

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 28, 2021
Merged

add geoRenderType optional paramter to geoscatter geoplot and geobubble functionalities #400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion plotly/plotlyfig.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
obj.PlotOptions.is_headmap_axis = false;
obj.PlotOptions.Quality = -1;
obj.PlotOptions.Zmin = [];
obj.PlotOptions.geoRenderType = 'geo';

% offline options
obj.PlotOptions.Offline = true;
Expand Down Expand Up @@ -251,6 +252,9 @@
if(strcmpi(varargin{a},'Zmin'))
obj.PlotOptions.Zmin = varargin{a+1};
end
if(strcmpi(varargin{a},'geoRenderType'))
obj.PlotOptions.geoRenderType = varargin{a+1};
end
end
end

Expand Down Expand Up @@ -1063,7 +1067,7 @@ function delete(obj)
|| strcmpi(fieldname,'yaxis') || strcmpi(fieldname,'cone')...
|| strcmpi(fieldname,'legend') || strcmpi(fieldname,'histogram')...
|| strcmpi(fieldname,'scatter') || strcmpi(fieldname,'line')...
|| strcmpi(fieldname,'scattergeo') ...
|| strcmpi(fieldname,'scattergeo') || strcmpi(fieldname,'scattermapbox')...
)
fprintf(['\nWhoops! ' exception.message(1:end-1) ' in ' fieldname '\n\n']);
end
Expand Down
122 changes: 81 additions & 41 deletions plotly/plotlyfig_aux/handlegraphics/UpdateGeoAxes.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,78 +17,96 @@ function UpdateGeoAxes(obj, geoIndex)
w = geoData.Position(3);
h = geoData.Position(4);

geo.domain.x = min([xo xo + w],1);
geo.domain.y = min([yo yo + h],1);
geoaxes.domain.x = min([xo xo + w],1);
geoaxes.domain.y = min([yo yo + h],1);

%-------------------------------------------------------------------------%

%-setting projection-%
geo.projection.type = 'mercator';
if strcmpi(obj.PlotOptions.geoRenderType, 'geo')
geoaxes.projection.type = 'mercator';
end

%-------------------------------------------------------------------------%

%-setting basemap-%
geo.framecolor = 'rgb(120,120,120)';

if strcmpi(geoData.Basemap, 'streets-light')
geo.oceancolor = 'rgba(20,220,220,1)';
geo.landcolor = 'rgba(20,220,220,0.2)';
elseif strcmpi(geoData.Basemap, 'colorterrain')
geo.oceancolor = 'rgba(118,165,225,0.6)';
geo.landcolor = 'rgba(190,180,170,1)';
geo.showcountries = true;
geo.showlakes = true;
end
if strcmpi(obj.PlotOptions.geoRenderType, 'geo')
geoaxes.framecolor = 'rgb(120,120,120)';

if strcmpi(geoData.Basemap, 'streets-light')
geoaxes.oceancolor = 'rgba(20,220,220,1)';
geoaxes.landcolor = 'rgba(20,220,220,0.2)';
elseif strcmpi(geoData.Basemap, 'colorterrain')
geoaxes.oceancolor = 'rgba(118,165,225,0.6)';
geoaxes.landcolor = 'rgba(190,180,170,1)';
geoaxes.showcountries = true;
geoaxes.showlakes = true;
end

geo.showocean = true;
geo.showcoastlines = false;
geo.showland = true;
geoaxes.showocean = true;
geoaxes.showcoastlines = false;
geoaxes.showland = true;
end

%-------------------------------------------------------------------------%

%-setting latitude axis-%
latTick = geoData.LatitudeAxis.TickValues;
if strcmpi(obj.PlotOptions.geoRenderType, 'geo')
latTick = geoData.LatitudeAxis.TickValues;

geo.lataxis.range = geoData.LatitudeLimits;
geo.lataxis.tick0 = latTick(1);
geo.lataxis.dtick = mean(diff(latTick));
geoaxes.lataxis.range = geoData.LatitudeLimits;
geoaxes.lataxis.tick0 = latTick(1);
geoaxes.lataxis.dtick = mean(diff(latTick));

if strcmpi(geoData.Grid, 'on')
geo.lataxis.showgrid = true;
geo.lataxis.gridwidth = geoData.LineWidth;
geo.lataxis.gridcolor = sprintf('rgba(%f,%f,%f,%f)', 255*geoData.GridColor, geoData.GridAlpha);
if strcmpi(geoData.Grid, 'on')
geoaxes.lataxis.showgrid = true;
geoaxes.lataxis.gridwidth = geoData.LineWidth;
geoaxes.lataxis.gridcolor = sprintf('rgba(%f,%f,%f,%f)', 255*geoData.GridColor, geoData.GridAlpha);
end
end

%-------------------------------------------------------------------------%

%-setting longitude axis-%
lonTick = geoData.LongitudeAxis.TickValues;
if strcmpi(obj.PlotOptions.geoRenderType, 'geo')
lonTick = geoData.LongitudeAxis.TickValues;

geo.lonaxis.range = geoData.LongitudeLimits;
geo.lonaxis.tick0 = lonTick(1);
geo.lonaxis.dtick = mean(diff(lonTick));
geoaxes.lonaxis.range = geoData.LongitudeLimits;
geoaxes.lonaxis.tick0 = lonTick(1);
geoaxes.lonaxis.dtick = mean(diff(lonTick));

if strcmpi(geoData.Grid, 'on')
geo.lonaxis.showgrid = true;
geo.lonaxis.gridwidth = geoData.LineWidth;
geo.lonaxis.gridcolor = sprintf('rgba(%f,%f,%f,%f)', 255*geoData.GridColor, geoData.GridAlpha);
if strcmpi(geoData.Grid, 'on')
geoaxes.lonaxis.showgrid = true;
geoaxes.lonaxis.gridwidth = geoData.LineWidth;
geoaxes.lonaxis.gridcolor = sprintf('rgba(%f,%f,%f,%f)', 255*geoData.GridColor, geoData.GridAlpha);
end
end

%-------------------------------------------------------------------------%

%-set map center-%
geo.center.lat = geoData.MapCenter(1);
geo.center.lon = geoData.MapCenter(2);
geoaxes.center.lat = geoData.MapCenter(1);
geoaxes.center.lon = geoData.MapCenter(2);

%-------------------------------------------------------------------------%

%-set better resolution-%
geo.resolution = '50';
if strcmpi(obj.PlotOptions.geoRenderType, 'geo')
geoaxes.resolution = '50';
end

%-------------------------------------------------------------------------%
%-----------------------------------------------------------------------------%

%-set geo axes to layout-%
obj.layout = setfield(obj.layout, sprintf('geo%d', xsource+1), geo);
%-set mapbox style-%
if strcmpi(obj.PlotOptions.geoRenderType, 'mapbox')
geoaxes.zoom = geoData.ZoomLevel - 1.4;

if strcmpi(geoData.Basemap, 'streets-light')
geoaxes.style = 'carto-positron';
elseif strcmpi(geoData.Basemap, 'colorterrain')
geoaxes.style = 'stamen-terrain';
end
end

%-------------------------------------------------------------------------%

Expand Down Expand Up @@ -120,16 +138,38 @@ function UpdateGeoAxes(obj, geoIndex)
end

if isText
obj.data{geoIndex}.type = 'scattergeo';

if strcmpi(obj.PlotOptions.geoRenderType, 'geo')
obj.data{geoIndex}.type = 'scattergeo';
elseif strcmpi(obj.PlotOptions.geoRenderType, 'mapbox')
obj.data{geoIndex}.type = 'scattermapbox';
end

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;

if strcmpi(obj.PlotOptions.geoRenderType, 'geo')
obj.data{geoIndex}.geo = obj.data{geoIndex-1}.geo;
elseif strcmpi(obj.PlotOptions.geoRenderType, 'mapbox')
obj.data{geoIndex}.subplot = obj.data{geoIndex-1}.subplot;
end
end

%-------------------------------------------------------------------------%

%-set geo axes to layout-%
if strcmpi(obj.PlotOptions.geoRenderType, 'geo')
obj.layout = setfield(obj.layout, sprintf('geo%d', xsource+1), geoaxes);
elseif strcmpi(obj.PlotOptions.geoRenderType, 'mapbox')
obj.layout = setfield(obj.layout, sprintf('mapbox%d', xsource+1), geoaxes);
end

%-------------------------------------------------------------------------%
end
32 changes: 27 additions & 5 deletions plotly/plotlyfig_aux/handlegraphics/updateGeoPlot.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,22 @@ function updateGeoPlot(obj,geoIndex)
[xsource, ysource] = findSourceAxis(obj,axIndex);

%-ASSOCIATE GEO-AXES LAYOUT-%
obj.data{geoIndex}.geo = sprintf('geo%d', xsource+1);
if strcmpi(obj.PlotOptions.geoRenderType, 'geo')
obj.data{geoIndex}.geo = sprintf('geo%d', xsource+1);
elseif strcmpi(obj.PlotOptions.geoRenderType, 'mapbox')
obj.data{geoIndex}.subplot = sprintf('mapbox%d', xsource+1);
end

%-------------------------------------------------------------------------%

%-set scattergeo type-%
obj.data{geoIndex}.type = 'scattergeo';
if strcmpi(obj.PlotOptions.geoRenderType, 'geo')
obj.data{geoIndex}.type = 'scattergeo';

%-set scattermapbox type-%
elseif strcmpi(obj.PlotOptions.geoRenderType, 'mapbox')
obj.data{geoIndex}.type = 'scattermapbox';
end

%-------------------------------------------------------------------------%

Expand All @@ -37,15 +47,27 @@ function updateGeoPlot(obj,geoIndex)

%-------------------------------------------------------------------------%

%-set marker field-%
obj.data{geoIndex}.marker = marker;

%-corrections-%
if strcmpi(geoData.Marker, 'none')
obj.data{geoIndex}.mode = 'lines';
else
if strcmpi(obj.PlotOptions.geoRenderType, 'mapbox')
marker.allowoverlap = true;
marker = rmfield(marker, 'symbol');

if strcmp(marker.color, 'rgba(0,0,0,0)') && isfield(marker, 'line')
marker.color = marker.line.color;
end
end
end

%-------------------------------------------------------------------------%

%-set marker field-%
obj.data{geoIndex}.marker = marker;

%-------------------------------------------------------------------------%

%-set line field-%
obj.data{geoIndex}.line = linee;

Expand Down
27 changes: 23 additions & 4 deletions plotly/plotlyfig_aux/handlegraphics/updateGeoScatter.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,27 @@ function updateGeoScatter(obj,geoIndex)
[xsource, ysource] = findSourceAxis(obj,axIndex);

%-ASSOCIATE GEO-AXES LAYOUT-%
obj.data{geoIndex}.geo = sprintf('geo%d', xsource+1);
if strcmpi(obj.PlotOptions.geoRenderType, 'geo')
obj.data{geoIndex}.geo = sprintf('geo%d', xsource+1);
elseif strcmpi(obj.PlotOptions.geoRenderType, 'mapbox')
obj.data{geoIndex}.subplot = sprintf('mapbox%d', xsource+1);
end

%-------------------------------------------------------------------------%

%-set scattergeo type-%
obj.data{geoIndex}.type = 'scattergeo';
if strcmpi(obj.PlotOptions.geoRenderType, 'geo')
obj.data{geoIndex}.type = 'scattergeo';

%-set scattermapbox type-%
elseif strcmpi(obj.PlotOptions.geoRenderType, 'mapbox')
obj.data{geoIndex}.type = 'scattermapbox';
end

%-------------------------------------------------------------------------%

%-set scattergeo mode-%
obj.data{geoIndex}.mode = 'markers';
obj.data{geoIndex}.mode = 'markers+text';

%-------------------------------------------------------------------------%

Expand All @@ -35,10 +45,19 @@ function updateGeoScatter(obj,geoIndex)
%-get marker setting-%
marker = extractGeoMarker(geoData, axisData);

if strcmpi(obj.PlotOptions.geoRenderType, 'mapbox')
marker.allowoverlap = true;
marker = rmfield(marker, 'symbol');

if strcmp(marker.color, 'rgba(0,0,0,0)') && isfield(marker, 'line')
marker.color = marker.line.color;
end
end

%-------------------------------------------------------------------------%

%-set marker field-%
obj.data{geoIndex}.marker = marker;
obj.data{geoIndex}.marker = marker;

%-------------------------------------------------------------------------%
end
Loading