Skip to content

Commit

Permalink
Update for April 24, 2020. Update ranges to accommodate growing numbers.
Browse files Browse the repository at this point in the history
  • Loading branch information
HolySpicoli committed Apr 25, 2020
1 parent f782e50 commit 6cbb039
Show file tree
Hide file tree
Showing 10 changed files with 105 additions and 93 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@
# ! = negates a PREVIOUS match only (i.e. subsequent matches negate the negation).
# \ = escapes a pattern character.

# Ignore the QGIS SVG output file, as we will apply canonicalization (C14N) to it, for better version control.
# Ignore the QGIS XML output files, as we will apply canonicalization (C14N) to them, for better version control.
/Build/Saskatchewan_COVID-19_Infection_Rates.qgis.svg
/Resources/Infection_Rate_Fill_Style.xml

# QGIS project backup files.
**/*.qgs~
Expand Down
10 changes: 5 additions & 5 deletions Build/Saskatchewan_COVID-19_Infection_Rates.inkscape.min.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 7 additions & 7 deletions Build/Saskatchewan_COVID-19_Infection_Rates.inkscape.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 5 additions & 5 deletions Build/Saskatchewan_COVID-19_Infection_Rates.qgis.c14n.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Release/Saskatchewan_COVID-19_Infection_Rates.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 5 additions & 5 deletions Release/Saskatchewan_COVID-19_Infection_Rates.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
40 changes: 40 additions & 0 deletions Resources/Infection_Rate_Fill_Style.c14n.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<qgis_style version="2">
<symbols>
<symbol alpha="1" clip_to_extent="1" force_rhr="0" name="Infection Rate Fill" type="fill">
<layer class="SimpleFill" enabled="1" locked="0" pass="0">
<prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"></prop>
<prop k="color" v="224,224,224,255"></prop>
<prop k="joinstyle" v="bevel"></prop>
<prop k="offset" v="0,0"></prop>
<prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"></prop>
<prop k="offset_unit" v="Pixel"></prop>
<prop k="outline_color" v="35,35,35,255"></prop>
<prop k="outline_style" v="solid"></prop>
<prop k="outline_width" v="3"></prop>
<prop k="outline_width_unit" v="Pixel"></prop>
<prop k="style" v="solid"></prop>
<data_defined_properties>
<Option type="Map">
<Option name="name" type="QString" value=""></Option>
<Option name="properties" type="Map">
<Option name="fillColor" type="Map">
<Option name="active" type="bool" value="true"></Option>
<Option name="expression" type="QString" value="with_variable(&#xA; 'infection_rate',&#xA; @infections / @population * @infection_per_pop,&#xA; CASE&#xA; WHEN @infection_rate > @infection_range_6&#xA;&#x9; THEN project_color('Range_6_Color')&#xA; WHEN @infection_rate > @infection_range_5&#xA;&#x9; THEN project_color('Range_5_Color')&#xA;&#x9;WHEN @infection_rate > @infection_range_4&#xA;&#x9; THEN project_color('Range_4_Color')&#xA;&#x9;WHEN @infection_rate > @infection_range_3&#xA;&#x9; THEN project_color('Range_3_Color')&#xA;&#x9;WHEN @infection_rate > @infection_range_2&#xA;&#x9; THEN project_color('Range_2_Color')&#xA;&#x9;WHEN @infection_rate > @infection_range_1&#xA;&#x9; THEN project_color('Range_1_Color')&#xA;&#x9;ELSE&#xA;&#x9; project_color('Range_0_Color')&#xA; END&#xA;)"></Option>
<Option name="type" type="int" value="3"></Option>
</Option>
<Option name="outlineColor" type="Map">
<Option name="active" type="bool" value="true"></Option>
<Option name="expression" type="QString" value="project_color('Border_Color')"></Option>
<Option name="type" type="int" value="3"></Option>
</Option>
</Option>
<Option name="type" type="QString" value="collection"></Option>
</Option>
</data_defined_properties>
</layer>
</symbol>
</symbols>
<colorramps></colorramps>
<textformats></textformats>
<labelsettings></labelsettings>
</qgis_style>
41 changes: 0 additions & 41 deletions Resources/Infection_Rate_Fill_Style.xml

This file was deleted.

12 changes: 12 additions & 0 deletions Resources/c14n.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/usr/bin/env bash
# SPDX-License-Identifier: CC-BY-4.0

# Copyright © 2020 HolySpicoli (https://github.com/HolySpicoli/).
# Licensed under the Creative Commons Attribution 4.0 International License (https://creativecommons.org/licenses/by/4.0/).
# See LICENSE.md (https://github.com/HolySpicoli/WikimediaCommonsFile-Saskatchewan_COVID-19_Infection_Rates.svg/blob/master/LICENSE.md).

# Change to the directory of this script.
cd "$(dirname "$0")"

# Use 'xmllint' (http://xmlsoft.org/xmllint.html) to perform canonicalization (C14N) on the XML file generated by QGIS, for better version control.
xmllint --c14n Infection_Rate_Fill_Style.xml > Infection_Rate_Fill_Style.c14n.xml
Loading

0 comments on commit 6cbb039

Please sign in to comment.