commit 629a828e5296a999270edcecd8e8b2d7f0c81051 Author: Iain R. Learmonth <irl@fsfe.org> Date: Tue Aug 7 14:57:01 2018 +0100 Fixes loading JSON for aggregated map plotting --- build.xml | 2 +- src/main/resources/web/js/rs/views/aggregate/map.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.xml b/build.xml index 77ab672..2f06209 100644 --- a/build.xml +++ b/build.xml @@ -182,7 +182,7 @@ includes="logback.xml" /> <zipfileset dir="${resources}/web" prefix="" - includes="css/* images/** js/** fonts/** templates/**" /> + includes="css/* images/** js/** fonts/** templates/** json/countries.topo.json" /> <zipfileset dir="${resources}/web/jsps" prefix="WEB-INF" includes="*.jsp"/> diff --git a/src/main/resources/web/js/rs/views/aggregate/map.js b/src/main/resources/web/js/rs/views/aggregate/map.js index c77ec10..fe69bc0 100644 --- a/src/main/resources/web/js/rs/views/aggregate/map.js +++ b/src/main/resources/web/js/rs/views/aggregate/map.js @@ -121,7 +121,7 @@ define([ return text; } - d3.json("/rs/json/countries.topo.json", function(error, us) { + d3.json("/json/countries.topo.json", function(error, us) { g.append("g") .attr("id", "countries") .style("fill","#fff")