Compare commits
9 Commits
9a53c940b1
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
5df3f1cdfa
|
|||
| 32fffa3fee | |||
| 922c2f8bf5 | |||
| e8043def69 | |||
| 4d30e1dd6e | |||
| 7b2a879440 | |||
| 48e121313c | |||
|
6fe34eb370
|
|||
|
bcfccd041b
|
110
cliff.toml
Normal file
110
cliff.toml
Normal file
@@ -0,0 +1,110 @@
|
|||||||
|
# git-cliff ~ default configuration file
|
||||||
|
# https://git-cliff.org/docs/configuration
|
||||||
|
#
|
||||||
|
# Lines starting with "#" are comments.
|
||||||
|
# Configuration options are organized into tables and keys.
|
||||||
|
# See documentation for more information on available options.
|
||||||
|
|
||||||
|
[changelog]
|
||||||
|
# template for the changelog header
|
||||||
|
header = """
|
||||||
|
# Changelog\n
|
||||||
|
All notable changes to this project will be documented in this file.\n
|
||||||
|
"""
|
||||||
|
# template for the changelog body
|
||||||
|
# https://keats.github.io/tera/docs/#introduction
|
||||||
|
body = """
|
||||||
|
{% if version %}\
|
||||||
|
## [{{ version | trim_start_matches(pat="v") }}] - {{ timestamp | date(format="%Y-%m-%d") }}
|
||||||
|
{% else %}\
|
||||||
|
## [unreleased]
|
||||||
|
{% endif %}\
|
||||||
|
{% for group, commits in commits | group_by(attribute="group") %}
|
||||||
|
### {{ group | striptags | trim | upper_first }}
|
||||||
|
{% for commit in commits %}
|
||||||
|
- {% if commit.scope %}*({{ commit.scope }})* {% endif %}\
|
||||||
|
{% if commit.breaking %}[**breaking**] {% endif %}\
|
||||||
|
{{ commit.message | upper_first }}\
|
||||||
|
{%- for footer in commit.footers -%}
|
||||||
|
{%- if footer.token == "Assisted-by" %} *(🤖 {{ footer.value | split(pat=" ") | first | trim }})*{%- endif -%}
|
||||||
|
{%- endfor %}\
|
||||||
|
{% endfor %}
|
||||||
|
{% endfor %}
|
||||||
|
|
||||||
|
{%- set ai_models = [] -%}
|
||||||
|
{%- for commit in commits -%}
|
||||||
|
{%- for footer in commit.footers -%}
|
||||||
|
{%- if footer.token == "Assisted-by" -%}
|
||||||
|
{%- set clean_value = footer.value | split(pat=" ") | first | trim -%}
|
||||||
|
{%- set_global ai_models = ai_models | concat(with=clean_value) -%}
|
||||||
|
{%- endif -%}
|
||||||
|
{%- endfor -%}
|
||||||
|
{%- endfor -%}
|
||||||
|
{%- if ai_models | length > 0 %}
|
||||||
|
### 🤖 AI Assistance Repartition
|
||||||
|
{%- for model in ai_models | unique | sort -%}
|
||||||
|
{%- set_global count = 0 -%}
|
||||||
|
{%- for m in ai_models -%}
|
||||||
|
{%- if m == model -%}
|
||||||
|
{%- set_global count = count + 1 -%}
|
||||||
|
{%- endif -%}
|
||||||
|
{%- endfor %}
|
||||||
|
- **{{ model }}**: {{ count }} commit{% if count > 1 %}s{% endif %}
|
||||||
|
{%- endfor %}
|
||||||
|
{% endif %}\n
|
||||||
|
"""
|
||||||
|
# template for the changelog footer
|
||||||
|
footer = """
|
||||||
|
<!-- generated by git-cliff -->
|
||||||
|
"""
|
||||||
|
# remove the leading and trailing s
|
||||||
|
trim = true
|
||||||
|
# postprocessors
|
||||||
|
postprocessors = [
|
||||||
|
# { pattern = '<REPO>', replace = "https://github.com/orhun/git-cliff" }, # replace repository URL
|
||||||
|
]
|
||||||
|
# render body even when there are no releases to process
|
||||||
|
# render_always = true
|
||||||
|
# output file path
|
||||||
|
# output = "test.md"
|
||||||
|
|
||||||
|
[git]
|
||||||
|
# parse the commits based on https://www.conventionalcommits.org
|
||||||
|
conventional_commits = true
|
||||||
|
# filter out the commits that are not conventional
|
||||||
|
filter_unconventional = true
|
||||||
|
# process each line of a commit as an individual commit
|
||||||
|
split_commits = false
|
||||||
|
# regex for preprocessing the commit messages
|
||||||
|
commit_preprocessors = [
|
||||||
|
# Replace issue numbers
|
||||||
|
#{ pattern = '\((\w+\s)?#([0-9]+)\)', replace = "([#${2}](<REPO>/issues/${2}))"},
|
||||||
|
# Check spelling of the commit with https://github.com/crate-ci/typos
|
||||||
|
# If the spelling is incorrect, it will be automatically fixed.
|
||||||
|
#{ pattern = '.*', replace_command = 'typos --write-changes -' },
|
||||||
|
]
|
||||||
|
# regex for parsing and grouping commits
|
||||||
|
commit_parsers = [
|
||||||
|
{ message = "^feat", group = "<!-- 0 -->🚀 Features" },
|
||||||
|
{ message = "^fix", group = "<!-- 1 -->🐛 Bug Fixes" },
|
||||||
|
{ message = "^doc", group = "<!-- 3 -->📚 Documentation" },
|
||||||
|
{ message = "^perf", group = "<!-- 4 -->⚡ Performance" },
|
||||||
|
{ message = "^refactor", group = "<!-- 2 -->🚜 Refactor" },
|
||||||
|
{ message = "^style", group = "<!-- 5 -->🎨 Styling" },
|
||||||
|
{ message = "^test", group = "<!-- 6 -->🧪 Testing" },
|
||||||
|
{ message = "^chore\\(release\\): prepare for", skip = true },
|
||||||
|
{ message = "^chore: update CHANGELOG.md", skip = true },
|
||||||
|
{ message = "^chore\\(deps.*\\)", skip = true },
|
||||||
|
{ message = "^chore\\(pr\\)", skip = true },
|
||||||
|
{ message = "^chore\\(pull\\)", skip = true },
|
||||||
|
{ message = "^chore|^ci", group = "<!-- 7 -->⚙️ Miscellaneous Tasks" },
|
||||||
|
{ body = ".*security", group = "<!-- 8 -->🛡️ Security" },
|
||||||
|
{ message = "^revert", group = "<!-- 9 -->◀️ Revert" },
|
||||||
|
{ message = ".*", group = "<!-- 10 -->💼 Other" },
|
||||||
|
]
|
||||||
|
# filter out the commits that are not matched by commit parsers
|
||||||
|
filter_commits = false
|
||||||
|
# sort the tags topologically
|
||||||
|
topo_order = false
|
||||||
|
# sort the commits inside sections by oldest/newest order
|
||||||
|
sort_commits = "oldest"
|
||||||
102
db/CHANGELOG.md
Normal file
102
db/CHANGELOG.md
Normal file
@@ -0,0 +1,102 @@
|
|||||||
|
# Changelog
|
||||||
|
|
||||||
|
All notable changes to this project will be documented in this file.
|
||||||
|
|
||||||
|
## [unreleased]
|
||||||
|
|
||||||
|
### ⚙️ Miscellaneous Tasks
|
||||||
|
|
||||||
|
- Add changelogs
|
||||||
|
|
||||||
|
## [db-gateway-v1.0.0] - 2026-06-04
|
||||||
|
|
||||||
|
### 🚀 Features
|
||||||
|
|
||||||
|
- *(db)* Add influx in db stack
|
||||||
|
- *(db)* Add traefik config example with actual server
|
||||||
|
- *(db)* Add rabittmq as mqtt stack
|
||||||
|
- *(db)* Add influx gateway from previous project
|
||||||
|
- *(db)* Add mqtt gateway from previous project
|
||||||
|
- *(db)* Merge datapoint and message
|
||||||
|
- *(db)* Add SubscribeTyped function and refactor DataPoint structure
|
||||||
|
- *(db)* Add initial main implementation
|
||||||
|
- *(db)* Add rest gateway
|
||||||
|
- *(db)* Add GET current value endpoint
|
||||||
|
- *(db)* Add GET history endpoint
|
||||||
|
- *(db)* Add mapping *(🤖 Junie:gemini-3-flash)*
|
||||||
|
- *(db)* Add swagger doc *(🤖 Junie:gemini-3-flash)*
|
||||||
|
- *(db)* Add parameter for time window in history endpoint
|
||||||
|
- *(db)* Add basic auth
|
||||||
|
- *(db)* Add deploiement stack
|
||||||
|
- *(db)* Add node tag for influx
|
||||||
|
- *(db)* Remove CO2PPM data over 1'000'000'000
|
||||||
|
- *(db)* Add battery field
|
||||||
|
- *(db)* Add battery REST endpoint *(🤖 Junie:claude-sonnet-4.6)*
|
||||||
|
- *(db)* Get mapping dynamically from file *(🤖 Junie:claude-sonnet-4.6)*
|
||||||
|
- *(db)* Add endpoint to export influx data to csv *(🤖 Junie:claude-sonnet-4.6)*
|
||||||
|
- *(server)* Add traefik entry for ui dashboard
|
||||||
|
- *(db)* Add co2 watchdog on each room *(🤖 Junie:gemini-3-flash)*
|
||||||
|
- *(db)* Add co2-status endpoint in REST API *(🤖 Junie:gemini-3-flash)*
|
||||||
|
|
||||||
|
### 🐛 Bug Fixes
|
||||||
|
|
||||||
|
- *(db)* Add missing entrypoint for influx explorer *(🤖 Gemini:gemini-3.1-pro)*
|
||||||
|
- *(db)* Add missing hostname for influx access in traefik
|
||||||
|
- *(db)* Wrong mqtt port
|
||||||
|
- *(db)* Typo in certResolver
|
||||||
|
- *(db)* Fail if now defaut user / password for mqtt
|
||||||
|
- *(db)* Allow gRPC proxy in traefik *(🤖 Gemini:gemini-3.1-pro)*
|
||||||
|
- *(db)* Proper api url instead of using swagger doc url
|
||||||
|
- *(db)* CORS request *(🤖 Gemini:gemini-3.1-pro)*
|
||||||
|
- *(db)* Url for api start with https
|
||||||
|
- *(db)* Get rooms from mapping file
|
||||||
|
- *(db)* Set time interval for influx limitations
|
||||||
|
- *(db)* Set higher file limit for influx limitations
|
||||||
|
- *(db)* Remove authorization for battery status endpoint
|
||||||
|
- *(db)* Window -> window_open
|
||||||
|
- *(db)* Push data with partial mapping
|
||||||
|
- *(db)* Filter random value
|
||||||
|
- *(db)* Mqtt hostname to keep internal config identique in case of rebuild
|
||||||
|
- *(db)* Add the room in the returned json
|
||||||
|
- *(db)* Return time in RFC3339 to avoid breakchange *(🤖 Junie:claude-opus-4.8)*
|
||||||
|
- *(db)* Return window tag in room status
|
||||||
|
- *(db)* Return only high co2 room for co2-status endpoint
|
||||||
|
- *(db)* Return error directly
|
||||||
|
|
||||||
|
### 🚜 Refactor
|
||||||
|
|
||||||
|
- *(db)* Move package
|
||||||
|
- *(db)* Unify env getters
|
||||||
|
- *(db)* Split campus and room mapping error detection
|
||||||
|
- *(db)* Map room and node on REST API
|
||||||
|
- *(db)* Add flag to run without MQTT part
|
||||||
|
- *(db)* Adapt SQL query for 5 min average
|
||||||
|
- *(db)* Round averages in SQL queries
|
||||||
|
- *(db)* Using moving average for room history *(🤖 Junie:gemini-3-flash)*
|
||||||
|
- *(db)* Change order for history
|
||||||
|
- *(db)* Add constante for max QOS
|
||||||
|
- *(db)* Add constante for defaultTimeout
|
||||||
|
|
||||||
|
### 📚 Documentation
|
||||||
|
|
||||||
|
- *(db)* Add deployement documentation
|
||||||
|
- *(db)* Fix typo in doc
|
||||||
|
|
||||||
|
### ⚙️ Miscellaneous Tasks
|
||||||
|
|
||||||
|
- Init
|
||||||
|
- *(db)* Typo and respect go guidelines
|
||||||
|
- *(db)* Get InfluxDB token by secrets *(🤖 Gemini:gemini-3-flash)*
|
||||||
|
- *(db)* Update critical dependancy
|
||||||
|
- *(db)* Add pre-commit for swagger documentation
|
||||||
|
- *(db)* Add local gitignore
|
||||||
|
- *(db)* Set 30min before offline for battery endpoint
|
||||||
|
|
||||||
|
### 🤖 AI Assistance Repartition
|
||||||
|
- **Gemini:gemini-3-flash**: 1 commit
|
||||||
|
- **Gemini:gemini-3.1-pro**: 3 commits
|
||||||
|
- **Junie:claude-opus-4.8**: 1 commit
|
||||||
|
- **Junie:claude-sonnet-4.6**: 3 commits
|
||||||
|
- **Junie:gemini-3-flash**: 5 commits
|
||||||
|
|
||||||
|
<!-- generated by git-cliff -->
|
||||||
BIN
doc_resources/nodes/hts221.pdf
Normal file
BIN
doc_resources/nodes/hts221.pdf
Normal file
Binary file not shown.
BIN
doc_resources/nodes/lps22hb-1.pdf
Normal file
BIN
doc_resources/nodes/lps22hb-1.pdf
Normal file
Binary file not shown.
BIN
doc_resources/nodes/lps22hb.pdf
Normal file
BIN
doc_resources/nodes/lps22hb.pdf
Normal file
Binary file not shown.
59
gateway/CHANGELOG.md
Normal file
59
gateway/CHANGELOG.md
Normal file
@@ -0,0 +1,59 @@
|
|||||||
|
# Changelog
|
||||||
|
|
||||||
|
All notable changes to this project will be documented in this file.
|
||||||
|
|
||||||
|
## [unreleased]
|
||||||
|
|
||||||
|
### ⚙️ Miscellaneous Tasks
|
||||||
|
|
||||||
|
- Remove useless gitkeep file
|
||||||
|
- Add changelogs
|
||||||
|
|
||||||
|
## [gateway-v1.0.0] - 2026-06-04
|
||||||
|
|
||||||
|
### 🚀 Features
|
||||||
|
|
||||||
|
- Add BLE-to-MQTT gateway implementation
|
||||||
|
- *(gateway)* Add configuration file
|
||||||
|
- *(gateway)* Implement BLE-to-MQTT gateway *(🤖 Claude:claude-sonnet-4-6)*
|
||||||
|
- *(gateway)* Add MQTTS support with TLS and authentication *(🤖 Claude:claude-sonnet-4-6)*
|
||||||
|
- *(gateway)* Add battery level support (key 0x05)
|
||||||
|
- *(gateway)* Add deduplication and continuous BLE scan *(🤖 Claude:claude-sonnet-4-6)*
|
||||||
|
|
||||||
|
### 🐛 Bug Fixes
|
||||||
|
|
||||||
|
- *(gateway)* Fix architecture diagram code block in README
|
||||||
|
- *(gateway)* Fix architecture diagram code block in README
|
||||||
|
- *(gateway)* Fix payload decoding endianness and skip preamble Switch temperature and CO2 decoding from little-endian to big-endian to match the Zephyr firmware implementation. Skip the 2-byte company id preamble (0xffff) at the start of the manufacturer data payload.
|
||||||
|
- *(gateway)* Replace UUID filter with manufacturer data preamble filter
|
||||||
|
- *(gateway)* Replace UUID filter with manufacturer data preamble filter
|
||||||
|
- *(gateway)* Fix BLE filtering and MQTT connection validation
|
||||||
|
- *(gateway)* Use exact payload size filter and improve robustness
|
||||||
|
- *(gateway)* Revert CO2 range check and add MQTT auto-reconnect
|
||||||
|
|
||||||
|
### 🚜 Refactor
|
||||||
|
|
||||||
|
- *(gateway)* Switch from GATT connection to passive BLE advertising *(🤖 Claude:claude-sonnet-4-6)*
|
||||||
|
|
||||||
|
### 📚 Documentation
|
||||||
|
|
||||||
|
- Add gateway README
|
||||||
|
- Add overnight test results and measurements graph
|
||||||
|
- Add overnight test results section to README
|
||||||
|
- *(gateway)* Add README with architecture and MQTT interface *(🤖 Claude:claude-sonnet-4-6)*
|
||||||
|
- *(gateway)* Document MQTT_PASSWORD environment variable in README
|
||||||
|
- *(gateway)* Add deployment checklist, systemd service and update README
|
||||||
|
- *(gateway)* Update README with battery field, security fixes and warnings
|
||||||
|
|
||||||
|
### ⚙️ Miscellaneous Tasks
|
||||||
|
|
||||||
|
- Init
|
||||||
|
- *(gateway)* Add Python dependencies file
|
||||||
|
- *(gateway)* Exclude config.json from repo, add example config
|
||||||
|
- *(gateway)* Use placeholder values in config.example.json
|
||||||
|
- *(gateway)* Update config.example.json with TLS and auth fields
|
||||||
|
|
||||||
|
### 🤖 AI Assistance Repartition
|
||||||
|
- **Claude:claude-sonnet-4-6**: 5 commits
|
||||||
|
|
||||||
|
<!-- generated by git-cliff -->
|
||||||
62
nodes/CHANGELOG.md
Normal file
62
nodes/CHANGELOG.md
Normal file
@@ -0,0 +1,62 @@
|
|||||||
|
# Changelog
|
||||||
|
|
||||||
|
All notable changes to this project will be documented in this file.
|
||||||
|
|
||||||
|
## [unreleased]
|
||||||
|
|
||||||
|
### ⚙️ Miscellaneous Tasks
|
||||||
|
|
||||||
|
- Add changelogs
|
||||||
|
|
||||||
|
## [project-submission] - 2026-06-04
|
||||||
|
|
||||||
|
### ⚙️ Miscellaneous Tasks
|
||||||
|
|
||||||
|
- Remove useless gitkeep file
|
||||||
|
- Remove zephyr sample file
|
||||||
|
- Remove release file from repo
|
||||||
|
|
||||||
|
## [nodes-v1.1.0] - 2026-06-04
|
||||||
|
|
||||||
|
### 🚀 Features
|
||||||
|
|
||||||
|
- *(nodes)* Adding management of read error on each values, hence
|
||||||
|
- *(nodes)* Add the battery level in the ble frame
|
||||||
|
- *(nodes)* Adding battery percent as new key/value in the BLE frame
|
||||||
|
- *(nodes)* Using an explicit thread, as it may cause the huge battery usage
|
||||||
|
- *(nodes)* Setting the fastest BLE advertising frequency to 1 minute instead of 2
|
||||||
|
|
||||||
|
### 🐛 Bug Fixes
|
||||||
|
|
||||||
|
- *(nodes)* Changing incorrect comment
|
||||||
|
- *(nodes)* Using MAC address as BT_ADDR
|
||||||
|
- *(nodes)* Reduce battery consumption
|
||||||
|
|
||||||
|
### 📚 Documentation
|
||||||
|
|
||||||
|
- *(nodes)* Adding comments in the nodes code
|
||||||
|
|
||||||
|
## [nodes-v1.0.0] - 2026-06-04
|
||||||
|
|
||||||
|
### 🚀 Features
|
||||||
|
|
||||||
|
- *(nodes)* WIP supervisor first implementation
|
||||||
|
- *(nodes)* Adding thermometer and hygrometer
|
||||||
|
- *(nodes)* WIP adding first implementation for BLE advertising.
|
||||||
|
- *(nodes)* Adding co2_level retrieval
|
||||||
|
- *(nodes)* Adding window status reading
|
||||||
|
- *(nodes)* Adding nodes firmware v1.0
|
||||||
|
|
||||||
|
### 🐛 Bug Fixes
|
||||||
|
|
||||||
|
- *(nodes)* Adjusting broadcasted data to fit definition
|
||||||
|
- *(nodes)* Fixing switch device tree and wrong ordering of ble values
|
||||||
|
- *(nodes)* Properly fetching data from temp/hygro sensor
|
||||||
|
- *(nodes)* Co2 level fetched as desibed in the documentation
|
||||||
|
- *(nodes)* Changing window status sensor to have unequipped nodes return 'window is closed' status
|
||||||
|
|
||||||
|
### ⚙️ Miscellaneous Tasks
|
||||||
|
|
||||||
|
- Init
|
||||||
|
|
||||||
|
<!-- generated by git-cliff -->
|
||||||
BIN
nodes/measures/ppk2-20260525T193804.png
Normal file
BIN
nodes/measures/ppk2-20260525T193804.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 59 KiB |
BIN
nodes/measures/ppk2-20260525T193809.ppk2
Normal file
BIN
nodes/measures/ppk2-20260525T193809.ppk2
Normal file
Binary file not shown.
32
notification_service/CHANGELOG.md
Normal file
32
notification_service/CHANGELOG.md
Normal file
@@ -0,0 +1,32 @@
|
|||||||
|
# Changelog
|
||||||
|
|
||||||
|
All notable changes to this project will be documented in this file.
|
||||||
|
|
||||||
|
## [unreleased]
|
||||||
|
|
||||||
|
### 🚀 Features
|
||||||
|
|
||||||
|
- *(notification)* Spring Boot Teams notification service (#19)
|
||||||
|
- *(notification)* Add mock mode for local testing without backend (#19 #21)
|
||||||
|
- *(notification-service)* Replace Teams with Telegram notifications *(🤖 Claude:claude-sonnet-4-6)*
|
||||||
|
- *(notification-service)* Add Dockerfile, actuator health and alert deduplication *(🤖 Claude:claude-sonnet-4-6)*
|
||||||
|
- *(notification-service)* Adapt to Go backend /api/v1/rooms/high-co2 endpoint
|
||||||
|
|
||||||
|
### 🐛 Bug Fixes
|
||||||
|
|
||||||
|
- *(notification)* Remove non-existent starter-scheduling dep, target Java 17
|
||||||
|
|
||||||
|
### 🧪 Testing
|
||||||
|
|
||||||
|
- *(notification-service)* Add unit tests and clean up Co2Level *(🤖 Claude:claude-sonnet-4-6)*
|
||||||
|
|
||||||
|
### ⚙️ Miscellaneous Tasks
|
||||||
|
|
||||||
|
- *(notification-service)* Add CI/CD pipeline with Docker, SSH deploy and API credentials
|
||||||
|
- *(notification-service)* Add SAST, dependency scan and DAST security gates
|
||||||
|
- Add changelogs
|
||||||
|
|
||||||
|
### 🤖 AI Assistance Repartition
|
||||||
|
- **Claude:claude-sonnet-4-6**: 3 commits
|
||||||
|
|
||||||
|
<!-- generated by git-cliff -->
|
||||||
100
report/meetings/pitch-adrien/slides.typ
Normal file
100
report/meetings/pitch-adrien/slides.typ
Normal file
@@ -0,0 +1,100 @@
|
|||||||
|
#import "/metadata.typ": *
|
||||||
|
#import "/resources/slides.typ": *
|
||||||
|
#show:make-glossary
|
||||||
|
|
||||||
|
#let HANDOUT = true
|
||||||
|
#let NOTES = false
|
||||||
|
|
||||||
|
#show: metropolis-theme.with(
|
||||||
|
aspect-ratio: "16-9",
|
||||||
|
config-info(
|
||||||
|
title: title_style(doc.title),
|
||||||
|
subtitle: doc.subtitle,
|
||||||
|
author: enumerating-authors(items: doc.author, multiline: false ),
|
||||||
|
date: date.defence,
|
||||||
|
institution: school.name,
|
||||||
|
),
|
||||||
|
footer: self => [#self.info.institution],
|
||||||
|
..get-config(),
|
||||||
|
config-common(
|
||||||
|
handout: HANDOUT,
|
||||||
|
show-notes-on-second-screen: if NOTES {right} else {none}
|
||||||
|
)
|
||||||
|
)
|
||||||
|
#set text(region: "gb")
|
||||||
|
|
||||||
|
#show: myglobals
|
||||||
|
|
||||||
|
#title-slide()
|
||||||
|
|
||||||
|
// considering these slides complexity, everything is done here, without dedicated files for each slide
|
||||||
|
// To anyone that may be concerned : this is NOT done with ill intents but only as convenience
|
||||||
|
|
||||||
|
// slide 1 -> CO2 ladder
|
||||||
|
/*
|
||||||
|
Plan : 1) introduction to CO2 scale by landsgemeinde
|
||||||
|
2) Rough description of ladder (1400, 2000)
|
||||||
|
*/
|
||||||
|
|
||||||
|
#let sep(body, width: 6em, height: 1.6em) = {
|
||||||
|
set text(weight: "bold", font: "Roboto")
|
||||||
|
place(
|
||||||
|
bottom + center,
|
||||||
|
dy: height / 2,
|
||||||
|
box(
|
||||||
|
fill: white,
|
||||||
|
height: height,
|
||||||
|
width: width,
|
||||||
|
stroke: 0.5pt,
|
||||||
|
radius: 5pt,
|
||||||
|
align(
|
||||||
|
center + horizon,
|
||||||
|
body
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
#figure(
|
||||||
|
table(
|
||||||
|
columns: (1fr,), rows: (1fr),
|
||||||
|
align: center,
|
||||||
|
inset: 0pt,
|
||||||
|
|
||||||
|
table.cell(fill:rgb("#ff5443"))[
|
||||||
|
Really bad air quality #sep[2000 ppm]
|
||||||
|
],
|
||||||
|
|
||||||
|
table.cell(fill:rgb("ffea62"))[
|
||||||
|
Bad air quality #sep[1400 ppm]
|
||||||
|
],
|
||||||
|
|
||||||
|
table.cell(fill:rgb("01ff70"))[
|
||||||
|
Good air quality #sep[400 ppm]
|
||||||
|
]
|
||||||
|
),
|
||||||
|
)<tab:co2_scale>
|
||||||
|
|
||||||
|
// slide 2 -> Simaria
|
||||||
|
/*
|
||||||
|
Plan : 1) Confederation has commanded Simaria
|
||||||
|
2) But no one knows about it thus nobody uses it
|
||||||
|
*/
|
||||||
|
#figure(
|
||||||
|
table(
|
||||||
|
columns: (0.3fr, 0.3fr),
|
||||||
|
align: center,
|
||||||
|
stroke: none,
|
||||||
|
image("../../resources/img/Logo_RGB_farbig_EN_positiv.svg", width: 100%),
|
||||||
|
image("../../resources/img/simaria_logo.png")
|
||||||
|
),
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
// slide 3 -> project architecture (including forecasting)
|
||||||
|
/*
|
||||||
|
Plan : 1) Describe project architecture as it was initially intended (including teams notification, forecasting and recommended opening duration)
|
||||||
|
*/
|
||||||
|
#figure(
|
||||||
|
image("../../resources/img/PI-top-level.drawio.png"),
|
||||||
|
)
|
||||||
500
report/resources/img/Logo_RGB_farbig_EN_positiv.svg
Normal file
500
report/resources/img/Logo_RGB_farbig_EN_positiv.svg
Normal file
@@ -0,0 +1,500 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<!-- Generator: Adobe Illustrator 26.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||||
|
<svg version="1.1" id="Ebene_3" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||||
|
viewBox="0 0 168.21 64.44" style="enable-background:new 0 0 168.21 64.44;" xml:space="preserve">
|
||||||
|
<style type="text/css">
|
||||||
|
.st0{fill:#FF0000;}
|
||||||
|
.st1{fill:#FFFFFF;}
|
||||||
|
</style>
|
||||||
|
<g>
|
||||||
|
<g>
|
||||||
|
<path d="M34.3,9.31c0.33,0,0.61-0.09,0.84-0.26c0.22-0.17,0.33-0.44,0.34-0.81c0-0.25-0.13-0.47-0.38-0.65
|
||||||
|
c-0.11-0.09-0.24-0.17-0.38-0.25s-0.29-0.16-0.44-0.24c-0.15-0.08-0.29-0.18-0.43-0.27c-0.15-0.09-0.28-0.19-0.39-0.3
|
||||||
|
c-0.25-0.21-0.37-0.49-0.38-0.82c0-0.42,0.17-0.76,0.49-1c0.31-0.24,0.7-0.35,1.17-0.36c0.14,0,0.3,0.01,0.48,0.03
|
||||||
|
c0.19,0.03,0.37,0.08,0.55,0.14l-0.08,0.47c-0.25-0.13-0.57-0.19-0.95-0.19c-0.13,0-0.27,0.01-0.4,0.04
|
||||||
|
c-0.13,0.03-0.25,0.08-0.37,0.16c-0.1,0.07-0.19,0.16-0.26,0.27c-0.07,0.12-0.1,0.27-0.1,0.44c0,0.12,0.03,0.24,0.1,0.35
|
||||||
|
c0.07,0.1,0.16,0.2,0.27,0.28c0.11,0.08,0.24,0.17,0.39,0.24c0.14,0.08,0.29,0.16,0.44,0.25c0.31,0.15,0.59,0.34,0.83,0.57
|
||||||
|
c0.11,0.11,0.21,0.24,0.28,0.39c0.06,0.15,0.1,0.32,0.1,0.52c-0.01,0.52-0.19,0.9-0.55,1.13c-0.35,0.23-0.74,0.34-1.17,0.34
|
||||||
|
c-0.51-0.01-0.9-0.08-1.18-0.22L33.14,9C33.44,9.2,33.82,9.31,34.3,9.31z"/>
|
||||||
|
<path d="M40.06,6.35c-0.27-0.12-0.54-0.19-0.82-0.19c-0.46,0-0.81,0.15-1.06,0.44c-0.25,0.29-0.38,0.68-0.38,1.15
|
||||||
|
c0,0.45,0.12,0.82,0.38,1.12c0.24,0.31,0.58,0.48,1.01,0.48c0.29,0,0.58-0.06,0.86-0.17l0.04,0.44c-0.31,0.09-0.64,0.14-0.98,0.13
|
||||||
|
c-0.62-0.01-1.07-0.21-1.37-0.61c-0.31-0.38-0.46-0.85-0.46-1.4c0-0.6,0.18-1.09,0.52-1.45c0.34-0.37,0.79-0.55,1.36-0.56
|
||||||
|
c0.24,0,0.43,0.02,0.59,0.05c0.08,0.01,0.15,0.03,0.21,0.04c0.05,0.02,0.1,0.04,0.13,0.05L40.06,6.35z"/>
|
||||||
|
<path d="M41.48,4.04h0.47v2.44h0.02c0.1-0.21,0.26-0.39,0.46-0.53c0.21-0.13,0.45-0.2,0.73-0.2c0.51,0,0.86,0.16,1.04,0.45
|
||||||
|
c0.18,0.3,0.27,0.69,0.26,1.18v2.29h-0.47V7.39c0-0.17-0.01-0.33-0.03-0.48c-0.02-0.15-0.06-0.27-0.13-0.38
|
||||||
|
c-0.12-0.24-0.37-0.36-0.75-0.37c-0.41,0.01-0.7,0.17-0.88,0.47c-0.17,0.31-0.26,0.64-0.25,0.99v2.05h-0.47V4.04z"/>
|
||||||
|
<path d="M50.17,9.67H49.6l-1.04-3.31h-0.02L47.5,9.67h-0.57L45.7,5.84h0.52l1.01,3.31h0.01l1.06-3.31h0.57l1.01,3.31h0.02
|
||||||
|
l1.06-3.31h0.47L50.17,9.67z"/>
|
||||||
|
<path d="M55.22,9.55c-0.36,0.14-0.73,0.21-1.11,0.21c-0.62-0.01-1.07-0.2-1.34-0.58c-0.27-0.37-0.4-0.84-0.4-1.43
|
||||||
|
c0-0.59,0.15-1.08,0.45-1.45c0.29-0.37,0.67-0.55,1.16-0.56c0.54,0.01,0.92,0.2,1.17,0.56c0.24,0.36,0.35,0.81,0.35,1.33v0.24
|
||||||
|
h-2.62c0,0.42,0.11,0.76,0.32,1.03c0.21,0.29,0.52,0.43,0.94,0.44c0.19,0,0.38-0.03,0.58-0.1c0.21-0.05,0.37-0.12,0.49-0.19V9.55z
|
||||||
|
M54.99,7.48c0-0.35-0.07-0.65-0.22-0.92c-0.16-0.26-0.41-0.4-0.76-0.41c-0.35,0.01-0.62,0.15-0.82,0.42
|
||||||
|
c-0.21,0.27-0.31,0.57-0.31,0.91H54.99z"/>
|
||||||
|
<path d="M57.46,4.82h-0.47V4.19h0.47V4.82z M56.99,5.84h0.47v3.83h-0.47V5.84z"/>
|
||||||
|
<path d="M58.89,9.27l2.3-3.02h-2.21V5.84h2.76v0.41l-2.3,3.02h2.3v0.4h-2.85V9.27z"/>
|
||||||
|
<path d="M65.72,9.55c-0.36,0.14-0.73,0.21-1.11,0.21c-0.63-0.01-1.07-0.2-1.34-0.58c-0.27-0.37-0.4-0.84-0.4-1.43
|
||||||
|
c0-0.59,0.15-1.08,0.45-1.45c0.29-0.37,0.67-0.55,1.16-0.56c0.54,0.01,0.92,0.2,1.17,0.56c0.24,0.36,0.35,0.81,0.35,1.33v0.24
|
||||||
|
h-2.62c0,0.42,0.11,0.76,0.32,1.03c0.21,0.29,0.52,0.43,0.94,0.44c0.19,0,0.38-0.03,0.58-0.1c0.21-0.05,0.37-0.12,0.49-0.19V9.55z
|
||||||
|
M65.49,7.48c0-0.35-0.07-0.65-0.22-0.92c-0.16-0.26-0.41-0.4-0.76-0.41c-0.35,0.01-0.62,0.15-0.82,0.42
|
||||||
|
c-0.21,0.27-0.31,0.57-0.31,0.91H65.49z"/>
|
||||||
|
<path d="M67.49,6.7c0-0.35-0.01-0.64-0.03-0.85h0.47v0.74h0.01c0.09-0.23,0.22-0.42,0.38-0.58c0.16-0.16,0.36-0.24,0.6-0.25
|
||||||
|
c0.12,0,0.23,0.02,0.33,0.04v0.5c-0.1-0.03-0.22-0.04-0.34-0.04c-0.19,0-0.34,0.05-0.46,0.13c-0.12,0.09-0.22,0.21-0.29,0.37
|
||||||
|
c-0.07,0.15-0.12,0.31-0.15,0.49c-0.04,0.19-0.05,0.37-0.05,0.54v1.89h-0.47V6.7z"/>
|
||||||
|
<path d="M71.05,4.82h-0.47V4.19h0.47V4.82z M70.57,5.84h0.47v3.83h-0.47V5.84z"/>
|
||||||
|
<path d="M73.53,9.35c0.23,0,0.44-0.06,0.6-0.19c0.16-0.12,0.24-0.28,0.25-0.5c0-0.23-0.1-0.4-0.28-0.53
|
||||||
|
c-0.18-0.12-0.39-0.24-0.64-0.34c-0.12-0.05-0.23-0.11-0.33-0.17s-0.21-0.13-0.3-0.2c-0.08-0.08-0.16-0.17-0.21-0.28
|
||||||
|
c-0.06-0.1-0.08-0.22-0.08-0.35c0-0.38,0.13-0.65,0.39-0.81c0.25-0.15,0.53-0.23,0.86-0.23c0.11,0,0.25,0.01,0.43,0.03
|
||||||
|
c0.17,0.03,0.35,0.08,0.52,0.14l-0.04,0.41c-0.28-0.11-0.56-0.17-0.85-0.18c-0.25,0-0.44,0.04-0.58,0.13
|
||||||
|
c-0.08,0.04-0.13,0.11-0.17,0.19c-0.04,0.08-0.07,0.19-0.07,0.31c0,0.08,0.03,0.16,0.08,0.23c0.06,0.06,0.13,0.12,0.22,0.18
|
||||||
|
c0.09,0.05,0.19,0.1,0.31,0.16c0.11,0.05,0.23,0.1,0.34,0.17c0.25,0.1,0.47,0.25,0.65,0.42c0.19,0.18,0.28,0.42,0.29,0.73
|
||||||
|
c0,0.2-0.04,0.37-0.12,0.5c-0.08,0.14-0.19,0.25-0.32,0.34c-0.28,0.17-0.58,0.25-0.89,0.25c-0.37,0-0.73-0.06-1.07-0.18l0.04-0.47
|
||||||
|
C72.82,9.27,73.15,9.35,73.53,9.35z"/>
|
||||||
|
<path d="M78.82,6.35C78.55,6.23,78.27,6.16,78,6.16c-0.46,0-0.81,0.15-1.06,0.44c-0.25,0.29-0.38,0.68-0.38,1.15
|
||||||
|
c0,0.45,0.12,0.82,0.38,1.12c0.24,0.31,0.58,0.48,1.01,0.48c0.29,0,0.58-0.06,0.86-0.17l0.04,0.44c-0.31,0.09-0.64,0.14-0.98,0.13
|
||||||
|
c-0.62-0.01-1.07-0.21-1.37-0.61c-0.31-0.38-0.46-0.85-0.46-1.4c0-0.6,0.18-1.09,0.52-1.45c0.34-0.37,0.79-0.55,1.36-0.56
|
||||||
|
c0.24,0,0.43,0.02,0.59,0.05c0.08,0.01,0.15,0.03,0.21,0.04c0.05,0.02,0.1,0.04,0.13,0.05L78.82,6.35z"/>
|
||||||
|
<path d="M80.24,4.04h0.47v2.44h0.02c0.1-0.21,0.26-0.39,0.46-0.53c0.21-0.13,0.45-0.2,0.73-0.2c0.51,0,0.86,0.16,1.04,0.45
|
||||||
|
c0.18,0.3,0.27,0.69,0.26,1.18v2.29h-0.47V7.39c0-0.17-0.01-0.33-0.03-0.48c-0.02-0.15-0.06-0.27-0.13-0.38
|
||||||
|
c-0.12-0.24-0.37-0.36-0.75-0.37c-0.41,0.01-0.7,0.17-0.88,0.47c-0.17,0.31-0.26,0.64-0.25,0.99v2.05h-0.47V4.04z"/>
|
||||||
|
<path d="M87.56,9.55c-0.36,0.14-0.73,0.21-1.11,0.21c-0.62-0.01-1.07-0.2-1.34-0.58c-0.27-0.37-0.4-0.84-0.4-1.43
|
||||||
|
c0-0.59,0.15-1.08,0.45-1.45c0.29-0.37,0.67-0.55,1.16-0.56c0.54,0.01,0.92,0.2,1.17,0.56c0.24,0.36,0.35,0.81,0.35,1.33v0.24
|
||||||
|
h-2.62c0,0.42,0.11,0.76,0.32,1.03c0.21,0.29,0.52,0.43,0.94,0.44c0.19,0,0.38-0.03,0.58-0.1c0.21-0.05,0.37-0.12,0.49-0.19V9.55z
|
||||||
|
M87.33,7.48c0-0.35-0.07-0.65-0.22-0.92c-0.16-0.26-0.41-0.4-0.76-0.41c-0.35,0.01-0.62,0.15-0.82,0.42
|
||||||
|
c-0.21,0.27-0.31,0.57-0.31,0.91H87.33z"/>
|
||||||
|
<path d="M91.83,4.43h2.56v0.45h-2.05v1.87h1.94V7.2h-1.94v2.02h2.14v0.45h-2.65V4.43z"/>
|
||||||
|
<path d="M96.58,4.82h-0.47V4.19h0.47V4.82z M96.11,5.84h0.47v3.83h-0.47V5.84z"/>
|
||||||
|
<path d="M101.39,9.67h-0.47V9.06h-0.02c-0.25,0.47-0.65,0.7-1.19,0.7c-0.52-0.01-0.92-0.2-1.18-0.58c-0.27-0.38-0.4-0.85-0.4-1.43
|
||||||
|
c-0.01-0.59,0.12-1.07,0.37-1.44c0.25-0.37,0.65-0.56,1.21-0.56c0.19,0,0.35,0.03,0.5,0.08c0.15,0.06,0.27,0.12,0.36,0.21
|
||||||
|
c0.2,0.18,0.31,0.32,0.34,0.44h0.02V4.04h0.47V9.67z M98.71,8.3c0.04,0.19,0.1,0.37,0.18,0.53c0.09,0.15,0.21,0.27,0.35,0.37
|
||||||
|
c0.14,0.1,0.32,0.16,0.55,0.16c0.21,0,0.39-0.05,0.54-0.16c0.14-0.09,0.25-0.22,0.34-0.38c0.17-0.34,0.25-0.69,0.25-1.06
|
||||||
|
c0-0.18-0.02-0.36-0.05-0.55c-0.04-0.18-0.1-0.35-0.2-0.51c-0.09-0.16-0.21-0.29-0.34-0.39c-0.15-0.09-0.33-0.14-0.54-0.14
|
||||||
|
c-0.23,0-0.41,0.05-0.55,0.14c-0.15,0.09-0.26,0.22-0.35,0.38c-0.08,0.15-0.14,0.32-0.18,0.51c-0.04,0.19-0.05,0.38-0.05,0.57
|
||||||
|
C98.65,7.93,98.67,8.12,98.71,8.3z"/>
|
||||||
|
<path d="M106.15,9.35c0,0.54-0.13,1-0.4,1.36c-0.27,0.37-0.74,0.56-1.4,0.57c-0.25-0.01-0.48-0.03-0.69-0.08
|
||||||
|
c-0.21-0.05-0.36-0.09-0.47-0.12l0.04-0.47c0.31,0.17,0.69,0.26,1.12,0.27c0.31,0,0.54-0.06,0.72-0.17
|
||||||
|
c0.18-0.1,0.31-0.24,0.4-0.42c0.09-0.18,0.15-0.39,0.17-0.62c0.02-0.23,0.03-0.49,0.03-0.76h-0.02c-0.27,0.51-0.66,0.76-1.16,0.75
|
||||||
|
c-0.6-0.02-1.02-0.23-1.26-0.65c-0.13-0.19-0.21-0.4-0.26-0.61c-0.06-0.22-0.09-0.44-0.09-0.65c-0.01-0.59,0.12-1.07,0.37-1.44
|
||||||
|
c0.25-0.37,0.65-0.56,1.21-0.56c0.25,0,0.47,0.03,0.66,0.08c0.19,0.07,0.36,0.22,0.53,0.44h0.02V5.84h0.47V9.35z M103.66,8.78
|
||||||
|
c0.17,0.31,0.45,0.47,0.85,0.48c0.43-0.01,0.73-0.18,0.91-0.5c0.17-0.31,0.25-0.65,0.25-1.01c0-0.48-0.08-0.86-0.24-1.15
|
||||||
|
c-0.17-0.29-0.46-0.44-0.89-0.45c-0.23,0-0.41,0.05-0.55,0.14c-0.15,0.09-0.26,0.22-0.35,0.38c-0.08,0.15-0.14,0.32-0.18,0.51
|
||||||
|
c-0.04,0.19-0.05,0.38-0.05,0.57C103.4,8.14,103.49,8.49,103.66,8.78z"/>
|
||||||
|
<path d="M110.44,9.55c-0.36,0.14-0.73,0.21-1.11,0.21c-0.62-0.01-1.07-0.2-1.34-0.58c-0.27-0.37-0.4-0.84-0.4-1.43
|
||||||
|
c0-0.59,0.15-1.08,0.45-1.45c0.29-0.37,0.67-0.55,1.16-0.56c0.54,0.01,0.92,0.2,1.17,0.56c0.24,0.36,0.35,0.81,0.35,1.33v0.24
|
||||||
|
h-2.62c0,0.42,0.11,0.76,0.32,1.03c0.21,0.29,0.52,0.43,0.94,0.44c0.19,0,0.38-0.03,0.58-0.1c0.21-0.05,0.37-0.12,0.49-0.19V9.55z
|
||||||
|
M110.2,7.48c0-0.35-0.07-0.65-0.22-0.92c-0.16-0.26-0.41-0.4-0.76-0.41c-0.35,0.01-0.62,0.15-0.82,0.42
|
||||||
|
c-0.21,0.27-0.31,0.57-0.31,0.91H110.2z"/>
|
||||||
|
<path d="M112.21,6.74c0-0.29-0.01-0.6-0.03-0.9h0.46v0.68h0.02c0.04-0.09,0.1-0.18,0.16-0.27c0.06-0.09,0.14-0.17,0.23-0.25
|
||||||
|
c0.09-0.08,0.21-0.14,0.35-0.19s0.31-0.07,0.5-0.07c0.47,0,0.81,0.15,1.01,0.42c0.19,0.27,0.29,0.62,0.29,1.05v2.44h-0.47V7.34
|
||||||
|
c0-0.36-0.07-0.65-0.2-0.87c-0.15-0.21-0.38-0.31-0.71-0.31c-0.42,0.01-0.71,0.16-0.88,0.45c-0.09,0.14-0.15,0.28-0.19,0.44
|
||||||
|
c-0.04,0.17-0.06,0.33-0.06,0.5v2.12h-0.47V6.74z"/>
|
||||||
|
<path d="M117.1,6.36c0.29-0.4,0.74-0.6,1.35-0.61c0.62,0.01,1.08,0.21,1.37,0.61c0.28,0.39,0.42,0.85,0.42,1.4
|
||||||
|
c0,0.54-0.14,1-0.42,1.39c-0.29,0.4-0.75,0.6-1.37,0.61c-0.61-0.01-1.06-0.21-1.35-0.61c-0.29-0.39-0.44-0.85-0.44-1.39
|
||||||
|
C116.67,7.21,116.81,6.74,117.1,6.36z M117.52,8.88c0.21,0.31,0.52,0.47,0.94,0.47c0.42,0,0.73-0.16,0.95-0.47
|
||||||
|
c0.21-0.29,0.31-0.67,0.31-1.12c0-0.45-0.1-0.83-0.31-1.14c-0.22-0.3-0.54-0.45-0.95-0.46c-0.42,0-0.73,0.16-0.94,0.46
|
||||||
|
c-0.22,0.31-0.33,0.69-0.33,1.14C117.19,8.21,117.3,8.58,117.52,8.88z"/>
|
||||||
|
<path d="M122.42,9.35c0.23,0,0.44-0.06,0.6-0.19c0.16-0.12,0.24-0.28,0.25-0.5c0-0.23-0.1-0.4-0.28-0.53
|
||||||
|
c-0.18-0.12-0.39-0.24-0.64-0.34c-0.12-0.05-0.23-0.11-0.33-0.17s-0.21-0.13-0.3-0.2c-0.08-0.08-0.16-0.17-0.21-0.28
|
||||||
|
c-0.06-0.1-0.08-0.22-0.08-0.35c0-0.38,0.13-0.65,0.39-0.81c0.25-0.15,0.53-0.23,0.86-0.23c0.11,0,0.25,0.01,0.43,0.03
|
||||||
|
c0.17,0.03,0.35,0.08,0.52,0.14l-0.04,0.41c-0.28-0.11-0.56-0.17-0.85-0.18c-0.25,0-0.44,0.04-0.58,0.13
|
||||||
|
c-0.08,0.04-0.13,0.11-0.17,0.19c-0.04,0.08-0.07,0.19-0.07,0.31c0,0.08,0.03,0.16,0.08,0.23c0.06,0.06,0.13,0.12,0.22,0.18
|
||||||
|
c0.09,0.05,0.19,0.1,0.31,0.16c0.11,0.05,0.23,0.1,0.34,0.17c0.25,0.1,0.47,0.25,0.65,0.42c0.19,0.18,0.28,0.42,0.29,0.73
|
||||||
|
c0,0.2-0.04,0.37-0.12,0.5c-0.08,0.14-0.19,0.25-0.32,0.34c-0.28,0.17-0.58,0.25-0.89,0.25c-0.37,0-0.73-0.06-1.07-0.18l0.04-0.47
|
||||||
|
C121.71,9.27,122.05,9.35,122.42,9.35z"/>
|
||||||
|
<path d="M125.92,9.35c0.23,0,0.44-0.06,0.6-0.19c0.16-0.12,0.24-0.28,0.25-0.5c0-0.23-0.1-0.4-0.28-0.53
|
||||||
|
c-0.18-0.12-0.39-0.24-0.64-0.34c-0.12-0.05-0.23-0.11-0.33-0.17s-0.21-0.13-0.3-0.2c-0.08-0.08-0.16-0.17-0.21-0.28
|
||||||
|
c-0.06-0.1-0.08-0.22-0.08-0.35c0-0.38,0.13-0.65,0.39-0.81c0.25-0.15,0.53-0.23,0.86-0.23c0.11,0,0.25,0.01,0.43,0.03
|
||||||
|
c0.17,0.03,0.35,0.08,0.52,0.14l-0.04,0.41c-0.28-0.11-0.56-0.17-0.85-0.18c-0.25,0-0.44,0.04-0.58,0.13
|
||||||
|
c-0.08,0.04-0.13,0.11-0.17,0.19c-0.04,0.08-0.07,0.19-0.07,0.31c0,0.08,0.03,0.16,0.08,0.23c0.06,0.06,0.13,0.12,0.22,0.18
|
||||||
|
c0.09,0.05,0.19,0.1,0.31,0.16c0.11,0.05,0.23,0.1,0.34,0.17c0.25,0.1,0.47,0.25,0.65,0.42c0.19,0.18,0.28,0.42,0.29,0.73
|
||||||
|
c0,0.2-0.04,0.37-0.12,0.5c-0.08,0.14-0.19,0.25-0.32,0.34c-0.28,0.17-0.58,0.25-0.89,0.25c-0.37,0-0.73-0.06-1.07-0.18l0.04-0.47
|
||||||
|
C125.22,9.27,125.55,9.35,125.92,9.35z"/>
|
||||||
|
<path d="M131.29,9.55c-0.36,0.14-0.73,0.21-1.11,0.21c-0.62-0.01-1.07-0.2-1.34-0.58c-0.27-0.37-0.4-0.84-0.4-1.43
|
||||||
|
c0-0.59,0.15-1.08,0.45-1.45c0.29-0.37,0.67-0.55,1.16-0.56c0.54,0.01,0.92,0.2,1.17,0.56c0.24,0.36,0.35,0.81,0.35,1.33v0.24
|
||||||
|
h-2.62c0,0.42,0.11,0.76,0.32,1.03c0.21,0.29,0.52,0.43,0.94,0.44c0.19,0,0.38-0.03,0.58-0.1c0.21-0.05,0.37-0.12,0.49-0.19V9.55z
|
||||||
|
M131.05,7.48c0-0.35-0.07-0.65-0.22-0.92c-0.16-0.26-0.41-0.4-0.76-0.41c-0.35,0.01-0.62,0.15-0.82,0.42
|
||||||
|
c-0.21,0.27-0.31,0.57-0.31,0.91H131.05z"/>
|
||||||
|
<path d="M133.06,6.74c0-0.29-0.01-0.6-0.03-0.9h0.46v0.68h0.02c0.04-0.09,0.1-0.18,0.16-0.27c0.06-0.09,0.14-0.17,0.23-0.25
|
||||||
|
c0.09-0.08,0.21-0.14,0.35-0.19s0.31-0.07,0.5-0.07c0.47,0,0.81,0.15,1.01,0.42c0.19,0.27,0.29,0.62,0.29,1.05v2.44h-0.47V7.34
|
||||||
|
c0-0.36-0.07-0.65-0.2-0.87c-0.15-0.21-0.38-0.31-0.71-0.31c-0.42,0.01-0.71,0.16-0.88,0.45c-0.09,0.14-0.15,0.28-0.19,0.44
|
||||||
|
c-0.04,0.17-0.06,0.33-0.06,0.5v2.12h-0.47V6.74z"/>
|
||||||
|
<path d="M138.52,9.35c0.23,0,0.44-0.06,0.6-0.19c0.16-0.12,0.24-0.28,0.25-0.5c0-0.23-0.1-0.4-0.28-0.53
|
||||||
|
c-0.18-0.12-0.39-0.24-0.64-0.34c-0.12-0.05-0.23-0.11-0.33-0.17s-0.21-0.13-0.3-0.2c-0.08-0.08-0.16-0.17-0.21-0.28
|
||||||
|
c-0.06-0.1-0.08-0.22-0.08-0.35c0-0.38,0.13-0.65,0.39-0.81c0.25-0.15,0.53-0.23,0.86-0.23c0.11,0,0.25,0.01,0.43,0.03
|
||||||
|
c0.17,0.03,0.35,0.08,0.52,0.14l-0.04,0.41c-0.28-0.11-0.56-0.17-0.85-0.18c-0.25,0-0.44,0.04-0.58,0.13
|
||||||
|
c-0.08,0.04-0.13,0.11-0.17,0.19C138.02,6.56,138,6.66,138,6.79c0,0.08,0.03,0.16,0.08,0.23c0.06,0.06,0.13,0.12,0.22,0.18
|
||||||
|
c0.09,0.05,0.19,0.1,0.31,0.16c0.11,0.05,0.23,0.1,0.34,0.17c0.25,0.1,0.47,0.25,0.65,0.42c0.19,0.18,0.28,0.42,0.29,0.73
|
||||||
|
c0,0.2-0.04,0.37-0.12,0.5c-0.08,0.14-0.19,0.25-0.32,0.34c-0.28,0.17-0.58,0.25-0.89,0.25c-0.37,0-0.73-0.06-1.07-0.18l0.04-0.47
|
||||||
|
C137.81,9.27,138.14,9.35,138.52,9.35z"/>
|
||||||
|
<path d="M143.8,6.35c-0.27-0.12-0.54-0.19-0.82-0.19c-0.46,0-0.81,0.15-1.06,0.44c-0.25,0.29-0.38,0.68-0.38,1.15
|
||||||
|
c0,0.45,0.12,0.82,0.38,1.12c0.24,0.31,0.58,0.48,1.01,0.48c0.29,0,0.58-0.06,0.86-0.17l0.04,0.44c-0.31,0.09-0.64,0.14-0.98,0.13
|
||||||
|
c-0.62-0.01-1.07-0.21-1.37-0.61c-0.31-0.38-0.46-0.85-0.46-1.4c0-0.6,0.18-1.09,0.52-1.45c0.34-0.37,0.79-0.55,1.36-0.56
|
||||||
|
c0.24,0,0.43,0.02,0.59,0.05c0.08,0.01,0.15,0.03,0.21,0.04c0.05,0.02,0.1,0.04,0.13,0.05L143.8,6.35z"/>
|
||||||
|
<path d="M145.23,4.04h0.47v2.44h0.02c0.1-0.21,0.26-0.39,0.46-0.53c0.21-0.13,0.45-0.2,0.73-0.2c0.51,0,0.86,0.16,1.04,0.45
|
||||||
|
c0.18,0.3,0.27,0.69,0.26,1.18v2.29h-0.47V7.39c0-0.17-0.01-0.33-0.03-0.48c-0.02-0.15-0.06-0.27-0.13-0.38
|
||||||
|
c-0.12-0.24-0.37-0.36-0.75-0.37c-0.41,0.01-0.7,0.17-0.88,0.47c-0.17,0.31-0.26,0.64-0.25,0.99v2.05h-0.47V4.04z"/>
|
||||||
|
<path d="M152.18,9.05h-0.01c-0.11,0.23-0.28,0.4-0.5,0.52c-0.22,0.12-0.46,0.18-0.71,0.19c-0.26,0-0.48-0.05-0.64-0.13
|
||||||
|
c-0.17-0.07-0.3-0.17-0.39-0.28c-0.16-0.25-0.24-0.47-0.23-0.67c0-0.32,0.08-0.57,0.23-0.76c0.15-0.19,0.34-0.32,0.58-0.4
|
||||||
|
c0.23-0.08,0.49-0.14,0.76-0.17c0.27-0.02,0.53-0.02,0.78-0.02h0.09V7.14c0.01-0.66-0.28-0.98-0.87-0.98
|
||||||
|
c-0.4-0.01-0.77,0.1-1.12,0.31V6.01c0.35-0.17,0.73-0.25,1.12-0.26c0.91-0.01,1.35,0.46,1.34,1.42v1.69c0,0.29,0.01,0.56,0.04,0.8
|
||||||
|
h-0.46V9.05z M152.14,7.74H152c-0.21,0-0.41,0.01-0.62,0.02c-0.21,0.02-0.41,0.06-0.58,0.13c-0.17,0.06-0.32,0.15-0.42,0.28
|
||||||
|
c-0.12,0.12-0.17,0.29-0.17,0.5c0,0.25,0.08,0.42,0.24,0.52c0.15,0.11,0.33,0.17,0.55,0.17c0.28,0,0.49-0.06,0.65-0.17
|
||||||
|
c0.16-0.1,0.27-0.23,0.34-0.38c0.08-0.15,0.12-0.31,0.13-0.46c0.01-0.15,0.01-0.28,0.01-0.38V7.74z"/>
|
||||||
|
<path d="M154.64,6.25h-0.77V5.84h0.77V5.56c0-0.21,0.01-0.4,0.03-0.6c0.01-0.19,0.05-0.36,0.11-0.51
|
||||||
|
c0.06-0.15,0.17-0.28,0.31-0.37c0.13-0.09,0.32-0.13,0.56-0.13c0.08,0,0.16,0,0.25,0.01c0.08,0.02,0.15,0.04,0.2,0.07l-0.03,0.41
|
||||||
|
c-0.1-0.05-0.23-0.08-0.38-0.08c-0.16,0-0.27,0.04-0.35,0.1c-0.08,0.08-0.14,0.18-0.17,0.29c-0.03,0.12-0.05,0.24-0.05,0.37
|
||||||
|
c0,0.13-0.01,0.27-0.01,0.39v0.33h0.86v0.41h-0.86v3.42h-0.47V6.25z"/>
|
||||||
|
<path d="M159.05,6.25h-0.87v2.48c0,0.17,0.04,0.32,0.12,0.44c0.08,0.12,0.21,0.19,0.39,0.19c0.17,0,0.31-0.03,0.43-0.09l0.03,0.39
|
||||||
|
c-0.06,0.02-0.13,0.04-0.23,0.07c-0.11,0.02-0.22,0.04-0.35,0.04c-0.21,0-0.37-0.03-0.49-0.1c-0.12-0.07-0.2-0.16-0.26-0.28
|
||||||
|
c-0.05-0.12-0.08-0.25-0.1-0.4c-0.02-0.15-0.02-0.31-0.02-0.49V6.25h-0.75V5.84h0.75V4.92l0.47-0.17v1.09h0.87V6.25z"/>
|
||||||
|
<path d="M36.25,15.33c-0.21-0.02-0.42-0.04-0.61-0.04c-0.68,0.01-1.2,0.22-1.57,0.64c-0.37,0.42-0.56,0.96-0.56,1.62
|
||||||
|
c0,0.67,0.18,1.21,0.55,1.62c0.36,0.42,0.88,0.63,1.57,0.64c0.18,0,0.38-0.02,0.61-0.05c0.22-0.03,0.41-0.09,0.56-0.17l0.03,0.45
|
||||||
|
c-0.16,0.08-0.35,0.14-0.58,0.17c-0.23,0.03-0.44,0.05-0.62,0.05c-0.83-0.01-1.48-0.26-1.94-0.75c-0.47-0.48-0.7-1.14-0.7-1.96
|
||||||
|
c0-0.81,0.24-1.46,0.71-1.96c0.46-0.49,1.11-0.74,1.93-0.75c0.17,0,0.38,0.01,0.62,0.04c0.24,0.03,0.43,0.08,0.58,0.16l-0.03,0.48
|
||||||
|
C36.65,15.43,36.46,15.36,36.25,15.33z"/>
|
||||||
|
<path d="M38.71,16.86c0.29-0.4,0.74-0.6,1.35-0.61c0.62,0.01,1.08,0.21,1.37,0.61c0.28,0.39,0.42,0.85,0.42,1.4
|
||||||
|
c0,0.54-0.14,1-0.42,1.39c-0.29,0.4-0.75,0.6-1.37,0.61c-0.61-0.01-1.06-0.21-1.35-0.61c-0.29-0.39-0.44-0.85-0.44-1.39
|
||||||
|
C38.28,17.71,38.42,17.24,38.71,16.86z M39.13,19.38c0.21,0.31,0.52,0.47,0.94,0.47c0.42,0,0.73-0.16,0.95-0.47
|
||||||
|
c0.21-0.29,0.31-0.67,0.31-1.12c0-0.45-0.1-0.83-0.31-1.14c-0.22-0.3-0.54-0.45-0.95-0.46c-0.42,0-0.73,0.16-0.94,0.46
|
||||||
|
c-0.22,0.31-0.33,0.69-0.33,1.14C38.8,18.71,38.91,19.08,39.13,19.38z"/>
|
||||||
|
<path d="M43.33,17.24c0-0.29-0.01-0.6-0.03-0.9h0.46v0.68h0.02c0.04-0.09,0.1-0.18,0.16-0.27c0.06-0.09,0.14-0.17,0.23-0.25
|
||||||
|
c0.09-0.08,0.21-0.14,0.35-0.19s0.31-0.07,0.5-0.07c0.47,0,0.81,0.15,1.01,0.42c0.19,0.27,0.29,0.62,0.29,1.05v2.44h-0.47v-2.33
|
||||||
|
c0-0.36-0.07-0.65-0.2-0.87c-0.15-0.21-0.38-0.31-0.71-0.31c-0.42,0.01-0.71,0.16-0.88,0.45c-0.09,0.14-0.15,0.28-0.19,0.44
|
||||||
|
c-0.04,0.17-0.06,0.33-0.06,0.5v2.12h-0.47V17.24z"/>
|
||||||
|
<path d="M48.4,16.75h-0.77v-0.41h0.77v-0.28c0-0.21,0.01-0.4,0.03-0.6c0.01-0.19,0.05-0.36,0.11-0.51
|
||||||
|
c0.06-0.15,0.17-0.28,0.31-0.37c0.13-0.09,0.32-0.13,0.56-0.13c0.08,0,0.16,0,0.25,0.01c0.08,0.02,0.15,0.04,0.2,0.07l-0.03,0.41
|
||||||
|
c-0.1-0.05-0.23-0.08-0.38-0.08c-0.15,0-0.27,0.04-0.35,0.1c-0.08,0.08-0.14,0.18-0.17,0.29c-0.03,0.12-0.04,0.24-0.04,0.37
|
||||||
|
c0,0.13-0.01,0.27-0.01,0.39v0.33h0.86v0.41h-0.86v3.42H48.4V16.75z"/>
|
||||||
|
<path d="M53.73,20.05c-0.36,0.14-0.73,0.21-1.11,0.21c-0.62-0.01-1.07-0.2-1.34-0.58c-0.27-0.37-0.4-0.84-0.4-1.43
|
||||||
|
c0-0.59,0.15-1.08,0.45-1.45c0.29-0.37,0.67-0.55,1.16-0.56c0.54,0.01,0.92,0.2,1.17,0.56c0.24,0.36,0.35,0.81,0.35,1.33v0.24
|
||||||
|
H51.4c0,0.42,0.11,0.76,0.32,1.03c0.21,0.29,0.52,0.43,0.94,0.44c0.19,0,0.38-0.03,0.58-0.1c0.21-0.05,0.37-0.12,0.49-0.19V20.05z
|
||||||
|
M53.5,17.98c0-0.35-0.07-0.65-0.22-0.92c-0.16-0.26-0.41-0.4-0.76-0.41c-0.35,0.01-0.62,0.15-0.82,0.42
|
||||||
|
c-0.21,0.27-0.31,0.57-0.31,0.91H53.5z M52.73,14.84h0.59l-0.94,1.08h-0.35L52.73,14.84z"/>
|
||||||
|
<path d="M58.53,20.17h-0.47v-0.61h-0.02c-0.25,0.47-0.65,0.7-1.19,0.7c-0.52-0.01-0.92-0.2-1.18-0.58
|
||||||
|
c-0.27-0.38-0.4-0.85-0.4-1.43c-0.01-0.59,0.12-1.07,0.37-1.44c0.25-0.37,0.65-0.56,1.21-0.56c0.19,0,0.35,0.03,0.5,0.08
|
||||||
|
c0.15,0.06,0.27,0.12,0.36,0.21c0.2,0.18,0.31,0.32,0.34,0.44h0.02v-2.44h0.47V20.17z M55.84,18.8c0.04,0.19,0.1,0.37,0.18,0.53
|
||||||
|
c0.09,0.15,0.21,0.27,0.35,0.37c0.14,0.1,0.32,0.16,0.55,0.16c0.21,0,0.39-0.05,0.54-0.16c0.14-0.09,0.25-0.22,0.34-0.38
|
||||||
|
c0.17-0.34,0.25-0.69,0.25-1.06c0-0.18-0.02-0.36-0.05-0.55c-0.04-0.18-0.1-0.35-0.2-0.51c-0.09-0.16-0.21-0.29-0.34-0.39
|
||||||
|
c-0.15-0.09-0.33-0.14-0.54-0.14c-0.23,0-0.41,0.05-0.55,0.14c-0.15,0.09-0.26,0.22-0.35,0.38c-0.08,0.15-0.14,0.32-0.18,0.51
|
||||||
|
c-0.04,0.19-0.05,0.38-0.05,0.57C55.79,18.43,55.81,18.62,55.84,18.8z"/>
|
||||||
|
<path d="M62.82,20.05c-0.36,0.14-0.73,0.21-1.11,0.21c-0.62-0.01-1.07-0.2-1.34-0.58c-0.27-0.37-0.4-0.84-0.4-1.43
|
||||||
|
c0-0.59,0.15-1.08,0.45-1.45c0.29-0.37,0.67-0.55,1.16-0.56c0.54,0.01,0.92,0.2,1.17,0.56c0.24,0.36,0.35,0.81,0.35,1.33v0.24
|
||||||
|
h-2.62c0,0.42,0.11,0.76,0.32,1.03c0.21,0.29,0.52,0.43,0.94,0.44c0.19,0,0.38-0.03,0.58-0.1c0.21-0.05,0.37-0.12,0.49-0.19V20.05
|
||||||
|
z M62.59,17.98c0-0.35-0.07-0.65-0.22-0.92c-0.16-0.26-0.41-0.4-0.76-0.41c-0.35,0.01-0.62,0.15-0.82,0.42
|
||||||
|
c-0.21,0.27-0.31,0.57-0.31,0.91H62.59z M61.82,14.84h0.59l-0.94,1.08h-0.35L61.82,14.84z"/>
|
||||||
|
<path d="M64.59,17.2c0-0.35-0.01-0.64-0.03-0.85h0.47v0.74h0.01c0.09-0.23,0.22-0.42,0.38-0.58c0.16-0.16,0.36-0.24,0.6-0.25
|
||||||
|
c0.12,0,0.23,0.02,0.33,0.04v0.5c-0.1-0.03-0.22-0.04-0.34-0.04c-0.19,0-0.34,0.05-0.46,0.13c-0.12,0.09-0.22,0.21-0.29,0.37
|
||||||
|
c-0.07,0.15-0.12,0.31-0.15,0.49c-0.04,0.19-0.05,0.37-0.05,0.54v1.89h-0.47V17.2z"/>
|
||||||
|
<path d="M69.87,19.55h-0.02c-0.11,0.23-0.28,0.4-0.5,0.52c-0.23,0.12-0.46,0.18-0.71,0.19c-0.27,0-0.48-0.05-0.65-0.13
|
||||||
|
c-0.17-0.07-0.3-0.17-0.39-0.28c-0.16-0.25-0.23-0.47-0.23-0.67c0-0.32,0.08-0.57,0.23-0.76c0.15-0.19,0.34-0.32,0.58-0.4
|
||||||
|
c0.23-0.08,0.49-0.14,0.77-0.17c0.27-0.02,0.53-0.02,0.78-0.02h0.09v-0.19c0.01-0.66-0.28-0.98-0.87-0.98
|
||||||
|
c-0.4-0.01-0.77,0.1-1.12,0.31v-0.46c0.35-0.17,0.73-0.25,1.12-0.26c0.9-0.01,1.35,0.46,1.34,1.42v1.69c0,0.29,0.01,0.56,0.04,0.8
|
||||||
|
h-0.46V19.55z M69.82,18.24h-0.14c-0.21,0-0.41,0.01-0.61,0.02c-0.22,0.02-0.41,0.06-0.58,0.13c-0.18,0.06-0.31,0.15-0.42,0.28
|
||||||
|
c-0.12,0.12-0.17,0.29-0.17,0.5c0,0.25,0.08,0.42,0.24,0.52c0.15,0.11,0.33,0.17,0.55,0.17c0.27,0,0.49-0.06,0.65-0.17
|
||||||
|
c0.15-0.1,0.27-0.23,0.34-0.38c0.08-0.15,0.12-0.31,0.13-0.46c0.01-0.15,0.02-0.28,0.02-0.38V18.24z"/>
|
||||||
|
<path d="M73.66,16.75h-0.87v2.48c0,0.17,0.04,0.32,0.12,0.44c0.07,0.12,0.2,0.19,0.39,0.19c0.17,0,0.31-0.03,0.44-0.09l0.03,0.39
|
||||||
|
c-0.06,0.02-0.13,0.04-0.23,0.07c-0.11,0.02-0.22,0.04-0.35,0.04c-0.21,0-0.37-0.03-0.49-0.1c-0.12-0.07-0.2-0.16-0.26-0.28
|
||||||
|
c-0.05-0.12-0.08-0.25-0.1-0.4c-0.01-0.15-0.02-0.31-0.02-0.49v-2.23h-0.75v-0.41h0.75v-0.92l0.47-0.17v1.09h0.87V16.75z"/>
|
||||||
|
<path d="M75.56,15.32h-0.47v-0.63h0.47V15.32z M75.09,16.34h0.47v3.83h-0.47V16.34z"/>
|
||||||
|
<path d="M77.48,16.86c0.29-0.4,0.74-0.6,1.35-0.61c0.62,0.01,1.08,0.21,1.37,0.61c0.28,0.39,0.42,0.85,0.42,1.4
|
||||||
|
c0,0.54-0.14,1-0.42,1.39c-0.29,0.4-0.75,0.6-1.37,0.61c-0.61-0.01-1.06-0.21-1.35-0.61c-0.29-0.39-0.44-0.85-0.44-1.39
|
||||||
|
C77.05,17.71,77.19,17.24,77.48,16.86z M77.89,19.38c0.21,0.31,0.52,0.47,0.94,0.47c0.42,0,0.73-0.16,0.95-0.47
|
||||||
|
c0.21-0.29,0.31-0.67,0.31-1.12c0-0.45-0.1-0.83-0.31-1.14c-0.22-0.3-0.54-0.45-0.95-0.46c-0.42,0-0.73,0.16-0.94,0.46
|
||||||
|
c-0.22,0.31-0.33,0.69-0.33,1.14C77.56,18.71,77.67,19.08,77.89,19.38z"/>
|
||||||
|
<path d="M82.09,17.24c0-0.29-0.01-0.6-0.03-0.9h0.46v0.68h0.02c0.04-0.09,0.1-0.18,0.16-0.27c0.06-0.09,0.14-0.17,0.23-0.25
|
||||||
|
c0.09-0.08,0.21-0.14,0.35-0.19s0.31-0.07,0.5-0.07c0.47,0,0.81,0.15,1.01,0.42c0.19,0.27,0.29,0.62,0.29,1.05v2.44h-0.47v-2.33
|
||||||
|
c0-0.36-0.07-0.65-0.2-0.87c-0.15-0.21-0.38-0.31-0.71-0.31c-0.42,0.01-0.71,0.16-0.88,0.45c-0.09,0.14-0.15,0.28-0.19,0.44
|
||||||
|
c-0.04,0.17-0.06,0.33-0.06,0.5v2.12h-0.47V17.24z"/>
|
||||||
|
<path d="M90.15,19.85c0.23,0,0.44-0.06,0.6-0.19c0.16-0.12,0.24-0.28,0.25-0.5c0-0.23-0.1-0.4-0.28-0.53
|
||||||
|
c-0.18-0.12-0.39-0.24-0.64-0.34c-0.12-0.05-0.23-0.11-0.33-0.17s-0.21-0.13-0.3-0.2c-0.08-0.08-0.16-0.17-0.21-0.28
|
||||||
|
c-0.06-0.1-0.08-0.22-0.08-0.35c0-0.38,0.13-0.65,0.39-0.81c0.25-0.15,0.53-0.23,0.86-0.23c0.11,0,0.25,0.01,0.43,0.03
|
||||||
|
c0.17,0.03,0.35,0.08,0.52,0.14l-0.04,0.41c-0.28-0.11-0.56-0.17-0.85-0.18c-0.25,0-0.44,0.04-0.58,0.13
|
||||||
|
c-0.08,0.04-0.13,0.11-0.17,0.19c-0.04,0.08-0.07,0.19-0.07,0.31c0,0.08,0.03,0.16,0.08,0.23c0.06,0.06,0.13,0.12,0.22,0.18
|
||||||
|
c0.09,0.05,0.19,0.1,0.31,0.16c0.11,0.05,0.23,0.1,0.34,0.17c0.25,0.1,0.47,0.25,0.65,0.42c0.19,0.18,0.28,0.42,0.29,0.73
|
||||||
|
c0,0.2-0.04,0.37-0.12,0.5c-0.08,0.14-0.19,0.25-0.32,0.34c-0.28,0.17-0.58,0.25-0.89,0.25c-0.37,0-0.73-0.06-1.07-0.18l0.04-0.47
|
||||||
|
C89.44,19.77,89.77,19.85,90.15,19.85z"/>
|
||||||
|
<path d="M95.93,19.27c-0.01,0.29,0,0.59,0.03,0.9H95.5v-0.68h-0.02c-0.03,0.08-0.08,0.17-0.14,0.25
|
||||||
|
c-0.06,0.09-0.14,0.18-0.23,0.26c-0.09,0.07-0.21,0.13-0.35,0.18c-0.14,0.06-0.31,0.08-0.51,0.08c-0.46,0-0.8-0.15-1-0.42
|
||||||
|
c-0.21-0.27-0.31-0.62-0.3-1.05v-2.45h0.47v2.33c0,0.37,0.07,0.65,0.22,0.85c0.14,0.22,0.37,0.33,0.69,0.33
|
||||||
|
c0.21,0,0.4-0.04,0.55-0.14c0.15-0.08,0.27-0.19,0.35-0.33c0.09-0.14,0.15-0.29,0.19-0.45c0.03-0.16,0.05-0.32,0.05-0.48v-2.12
|
||||||
|
h0.47V19.27z"/>
|
||||||
|
<path d="M98.17,15.32H97.7v-0.63h0.47V15.32z M97.7,16.34h0.47v3.83H97.7V16.34z"/>
|
||||||
|
<path d="M100.66,19.85c0.23,0,0.44-0.06,0.6-0.19c0.16-0.12,0.24-0.28,0.25-0.5c0-0.23-0.1-0.4-0.28-0.53
|
||||||
|
c-0.18-0.12-0.39-0.24-0.64-0.34c-0.12-0.05-0.23-0.11-0.33-0.17s-0.21-0.13-0.3-0.2c-0.08-0.08-0.16-0.17-0.21-0.28
|
||||||
|
c-0.06-0.1-0.08-0.22-0.08-0.35c0-0.38,0.13-0.65,0.39-0.81c0.25-0.15,0.53-0.23,0.86-0.23c0.11,0,0.25,0.01,0.43,0.03
|
||||||
|
c0.17,0.03,0.35,0.08,0.52,0.14l-0.04,0.41c-0.28-0.11-0.56-0.17-0.85-0.18c-0.25,0-0.44,0.04-0.58,0.13
|
||||||
|
c-0.08,0.04-0.13,0.11-0.17,0.19c-0.04,0.08-0.07,0.19-0.07,0.31c0,0.08,0.03,0.16,0.08,0.23c0.06,0.06,0.13,0.12,0.22,0.18
|
||||||
|
c0.09,0.05,0.19,0.1,0.31,0.16c0.11,0.05,0.23,0.1,0.34,0.17c0.25,0.1,0.47,0.25,0.65,0.42c0.19,0.18,0.28,0.42,0.29,0.73
|
||||||
|
c0,0.2-0.04,0.37-0.12,0.5c-0.08,0.14-0.19,0.25-0.32,0.34c-0.28,0.17-0.58,0.25-0.89,0.25c-0.37,0-0.73-0.06-1.07-0.18l0.04-0.47
|
||||||
|
C99.95,19.77,100.28,19.85,100.66,19.85z"/>
|
||||||
|
<path d="M104.16,19.85c0.23,0,0.44-0.06,0.6-0.19c0.16-0.12,0.24-0.28,0.25-0.5c0-0.23-0.1-0.4-0.28-0.53
|
||||||
|
c-0.18-0.12-0.39-0.24-0.64-0.34c-0.12-0.05-0.23-0.11-0.33-0.17s-0.21-0.13-0.3-0.2c-0.08-0.08-0.16-0.17-0.21-0.28
|
||||||
|
c-0.06-0.1-0.08-0.22-0.08-0.35c0-0.38,0.13-0.65,0.39-0.81c0.25-0.15,0.53-0.23,0.86-0.23c0.11,0,0.25,0.01,0.43,0.03
|
||||||
|
c0.17,0.03,0.35,0.08,0.52,0.14l-0.04,0.41c-0.28-0.11-0.56-0.17-0.85-0.18c-0.25,0-0.44,0.04-0.58,0.13
|
||||||
|
c-0.08,0.04-0.13,0.11-0.17,0.19c-0.04,0.08-0.07,0.19-0.07,0.31c0,0.08,0.03,0.16,0.08,0.23c0.06,0.06,0.13,0.12,0.22,0.18
|
||||||
|
c0.09,0.05,0.19,0.1,0.31,0.16c0.11,0.05,0.23,0.1,0.34,0.17c0.25,0.1,0.47,0.25,0.65,0.42c0.19,0.18,0.28,0.42,0.29,0.73
|
||||||
|
c0,0.2-0.04,0.37-0.12,0.5c-0.08,0.14-0.19,0.25-0.32,0.34c-0.28,0.17-0.58,0.25-0.89,0.25c-0.37,0-0.73-0.06-1.07-0.18l0.04-0.47
|
||||||
|
C103.45,19.77,103.78,19.85,104.16,19.85z"/>
|
||||||
|
<path d="M109.52,20.05c-0.36,0.14-0.73,0.21-1.11,0.21c-0.62-0.01-1.07-0.2-1.34-0.58c-0.27-0.37-0.4-0.84-0.4-1.43
|
||||||
|
c0-0.59,0.15-1.08,0.45-1.45c0.29-0.37,0.67-0.55,1.16-0.56c0.54,0.01,0.92,0.2,1.17,0.56c0.24,0.36,0.35,0.81,0.35,1.33v0.24
|
||||||
|
h-2.62c0,0.42,0.11,0.76,0.32,1.03c0.21,0.29,0.52,0.43,0.94,0.44c0.19,0,0.38-0.03,0.58-0.1c0.21-0.05,0.37-0.12,0.49-0.19V20.05
|
||||||
|
z M109.29,17.98c0-0.35-0.07-0.65-0.22-0.92c-0.16-0.26-0.41-0.4-0.76-0.41c-0.35,0.01-0.62,0.15-0.82,0.42
|
||||||
|
c-0.21,0.27-0.31,0.57-0.31,0.91H109.29z"/>
|
||||||
|
<path d="M36.25,25.83c-0.21-0.02-0.42-0.04-0.61-0.04c-0.68,0.01-1.2,0.22-1.57,0.64c-0.37,0.42-0.56,0.96-0.56,1.62
|
||||||
|
c0,0.67,0.18,1.21,0.55,1.62c0.36,0.42,0.88,0.63,1.57,0.64c0.18,0,0.38-0.02,0.61-0.05c0.22-0.03,0.41-0.09,0.56-0.17l0.03,0.45
|
||||||
|
c-0.16,0.08-0.35,0.14-0.58,0.17c-0.23,0.03-0.44,0.05-0.62,0.05c-0.83-0.01-1.48-0.26-1.94-0.75c-0.47-0.48-0.7-1.14-0.7-1.96
|
||||||
|
c0-0.81,0.24-1.46,0.71-1.96c0.46-0.49,1.11-0.74,1.93-0.75c0.17,0,0.38,0.01,0.62,0.04c0.24,0.03,0.43,0.08,0.58,0.16l-0.03,0.48
|
||||||
|
C36.65,25.93,36.46,25.86,36.25,25.83z"/>
|
||||||
|
<path d="M38.71,27.36c0.29-0.4,0.74-0.6,1.35-0.61c0.62,0.01,1.08,0.21,1.37,0.61c0.28,0.39,0.42,0.85,0.42,1.4
|
||||||
|
c0,0.54-0.14,1-0.42,1.39c-0.29,0.4-0.75,0.6-1.37,0.61c-0.61-0.01-1.06-0.21-1.35-0.61c-0.29-0.39-0.44-0.85-0.44-1.39
|
||||||
|
C38.28,28.21,38.42,27.74,38.71,27.36z M39.13,29.88c0.21,0.31,0.52,0.47,0.94,0.47c0.42,0,0.73-0.16,0.95-0.47
|
||||||
|
c0.21-0.29,0.31-0.67,0.31-1.12c0-0.45-0.1-0.83-0.31-1.14c-0.22-0.3-0.54-0.45-0.95-0.46c-0.42,0-0.73,0.16-0.94,0.46
|
||||||
|
c-0.22,0.31-0.33,0.69-0.33,1.14C38.8,29.21,38.91,29.58,39.13,29.88z"/>
|
||||||
|
<path d="M43.33,27.74c0-0.29-0.01-0.6-0.03-0.9h0.46v0.68h0.02c0.04-0.09,0.1-0.18,0.16-0.27c0.06-0.09,0.14-0.17,0.23-0.25
|
||||||
|
c0.09-0.08,0.21-0.14,0.35-0.19s0.31-0.07,0.5-0.07c0.47,0,0.81,0.15,1.01,0.42c0.19,0.27,0.29,0.62,0.29,1.05v2.44h-0.47v-2.33
|
||||||
|
c0-0.36-0.07-0.65-0.2-0.87c-0.15-0.21-0.38-0.31-0.71-0.31c-0.42,0.01-0.71,0.16-0.88,0.45c-0.09,0.14-0.15,0.28-0.19,0.44
|
||||||
|
c-0.04,0.17-0.06,0.33-0.06,0.5v2.12h-0.47V27.74z"/>
|
||||||
|
<path d="M48.4,27.25h-0.77v-0.41h0.77v-0.28c0-0.21,0.01-0.4,0.03-0.6c0.01-0.19,0.05-0.36,0.11-0.51
|
||||||
|
c0.06-0.15,0.17-0.28,0.31-0.37c0.13-0.09,0.32-0.13,0.56-0.13c0.08,0,0.16,0,0.25,0.01c0.08,0.02,0.15,0.04,0.2,0.07l-0.03,0.41
|
||||||
|
c-0.1-0.05-0.23-0.08-0.38-0.08c-0.15,0-0.27,0.04-0.35,0.1c-0.08,0.08-0.14,0.18-0.17,0.29c-0.03,0.12-0.04,0.24-0.04,0.37
|
||||||
|
c0,0.13-0.01,0.27-0.01,0.39v0.33h0.86v0.41h-0.86v3.42H48.4V27.25z"/>
|
||||||
|
<path d="M53.73,30.55c-0.36,0.14-0.73,0.21-1.11,0.21c-0.62-0.01-1.07-0.2-1.34-0.58c-0.27-0.37-0.4-0.84-0.4-1.43
|
||||||
|
c0-0.59,0.15-1.08,0.45-1.45c0.29-0.37,0.67-0.55,1.16-0.56c0.54,0.01,0.92,0.2,1.17,0.56c0.24,0.36,0.35,0.81,0.35,1.33v0.24
|
||||||
|
H51.4c0,0.42,0.11,0.76,0.32,1.03c0.21,0.29,0.52,0.43,0.94,0.44c0.19,0,0.38-0.03,0.58-0.1c0.21-0.05,0.37-0.12,0.49-0.19V30.55z
|
||||||
|
M53.5,28.48c0-0.35-0.07-0.65-0.22-0.92c-0.16-0.26-0.41-0.4-0.76-0.41c-0.35,0.01-0.62,0.15-0.82,0.42
|
||||||
|
c-0.21,0.27-0.31,0.57-0.31,0.91H53.5z"/>
|
||||||
|
<path d="M58.53,30.67h-0.47v-0.61h-0.02c-0.25,0.47-0.65,0.7-1.19,0.7c-0.52-0.01-0.92-0.2-1.18-0.58
|
||||||
|
c-0.27-0.38-0.4-0.85-0.4-1.43c-0.01-0.59,0.12-1.07,0.37-1.44c0.25-0.37,0.65-0.56,1.21-0.56c0.19,0,0.35,0.03,0.5,0.08
|
||||||
|
c0.15,0.06,0.27,0.12,0.36,0.21c0.2,0.18,0.31,0.32,0.34,0.44h0.02v-2.44h0.47V30.67z M55.84,29.3c0.04,0.19,0.1,0.37,0.18,0.53
|
||||||
|
c0.09,0.15,0.21,0.27,0.35,0.37c0.14,0.1,0.32,0.16,0.55,0.16c0.21,0,0.39-0.05,0.54-0.16c0.14-0.09,0.25-0.22,0.34-0.38
|
||||||
|
c0.17-0.34,0.25-0.69,0.25-1.06c0-0.18-0.02-0.36-0.05-0.55c-0.04-0.18-0.1-0.35-0.2-0.51c-0.09-0.16-0.21-0.29-0.34-0.39
|
||||||
|
c-0.15-0.09-0.33-0.14-0.54-0.14c-0.23,0-0.41,0.05-0.55,0.14c-0.15,0.09-0.26,0.22-0.35,0.38c-0.08,0.15-0.14,0.32-0.18,0.51
|
||||||
|
c-0.04,0.19-0.05,0.38-0.05,0.57C55.79,28.93,55.81,29.12,55.84,29.3z"/>
|
||||||
|
<path d="M62.82,30.55c-0.36,0.14-0.73,0.21-1.11,0.21c-0.62-0.01-1.07-0.2-1.34-0.58c-0.27-0.37-0.4-0.84-0.4-1.43
|
||||||
|
c0-0.59,0.15-1.08,0.45-1.45c0.29-0.37,0.67-0.55,1.16-0.56c0.54,0.01,0.92,0.2,1.17,0.56c0.24,0.36,0.35,0.81,0.35,1.33v0.24
|
||||||
|
h-2.62c0,0.42,0.11,0.76,0.32,1.03c0.21,0.29,0.52,0.43,0.94,0.44c0.19,0,0.38-0.03,0.58-0.1c0.21-0.05,0.37-0.12,0.49-0.19V30.55
|
||||||
|
z M62.59,28.48c0-0.35-0.07-0.65-0.22-0.92c-0.16-0.26-0.41-0.4-0.76-0.41c-0.35,0.01-0.62,0.15-0.82,0.42
|
||||||
|
c-0.21,0.27-0.31,0.57-0.31,0.91H62.59z"/>
|
||||||
|
<path d="M64.59,27.7c0-0.35-0.01-0.64-0.03-0.85h0.47v0.74h0.01c0.09-0.23,0.22-0.42,0.38-0.58c0.16-0.16,0.36-0.24,0.6-0.25
|
||||||
|
c0.12,0,0.23,0.02,0.33,0.04v0.5c-0.1-0.03-0.22-0.04-0.34-0.04c-0.19,0-0.34,0.05-0.46,0.13c-0.12,0.09-0.22,0.21-0.29,0.37
|
||||||
|
c-0.07,0.15-0.12,0.31-0.15,0.49c-0.04,0.19-0.05,0.37-0.05,0.54v1.89h-0.47V27.7z"/>
|
||||||
|
<path d="M69.87,30.05h-0.02c-0.11,0.23-0.28,0.4-0.5,0.52c-0.23,0.12-0.46,0.18-0.71,0.19c-0.27,0-0.48-0.05-0.65-0.13
|
||||||
|
c-0.17-0.07-0.3-0.17-0.39-0.28c-0.16-0.25-0.23-0.47-0.23-0.67c0-0.32,0.08-0.57,0.23-0.76c0.15-0.19,0.34-0.32,0.58-0.4
|
||||||
|
c0.23-0.08,0.49-0.14,0.77-0.17c0.27-0.02,0.53-0.02,0.78-0.02h0.09v-0.19c0.01-0.66-0.28-0.98-0.87-0.98
|
||||||
|
c-0.4-0.01-0.77,0.1-1.12,0.31v-0.46c0.35-0.17,0.73-0.25,1.12-0.26c0.9-0.01,1.35,0.46,1.34,1.42v1.69c0,0.29,0.01,0.56,0.04,0.8
|
||||||
|
h-0.46V30.05z M69.82,28.74h-0.14c-0.21,0-0.41,0.01-0.61,0.02c-0.22,0.02-0.41,0.06-0.58,0.13c-0.18,0.06-0.31,0.15-0.42,0.28
|
||||||
|
c-0.12,0.12-0.17,0.29-0.17,0.5c0,0.25,0.08,0.42,0.24,0.52c0.15,0.11,0.33,0.17,0.55,0.17c0.27,0,0.49-0.06,0.65-0.17
|
||||||
|
c0.15-0.1,0.27-0.23,0.34-0.38c0.08-0.15,0.12-0.31,0.13-0.46c0.01-0.15,0.02-0.28,0.02-0.38V28.74z"/>
|
||||||
|
<path d="M71.65,30.27l2.3-3.02h-2.21v-0.41h2.76v0.41l-2.3,3.02h2.3v0.4h-2.85V30.27z"/>
|
||||||
|
<path d="M76.39,25.82h-0.47v-0.63h0.47V25.82z M75.92,26.84h0.47v3.83h-0.47V26.84z"/>
|
||||||
|
<path d="M78.31,27.36c0.29-0.4,0.74-0.6,1.35-0.61c0.62,0.01,1.08,0.21,1.37,0.61c0.28,0.39,0.42,0.85,0.42,1.4
|
||||||
|
c0,0.54-0.14,1-0.42,1.39c-0.29,0.4-0.75,0.6-1.37,0.61c-0.61-0.01-1.06-0.21-1.35-0.61c-0.29-0.39-0.44-0.85-0.44-1.39
|
||||||
|
C77.88,28.21,78.02,27.74,78.31,27.36z M78.73,29.88c0.21,0.31,0.52,0.47,0.94,0.47c0.42,0,0.73-0.16,0.95-0.47
|
||||||
|
c0.21-0.29,0.31-0.67,0.31-1.12c0-0.45-0.1-0.83-0.31-1.14c-0.22-0.3-0.54-0.45-0.95-0.46c-0.42,0-0.73,0.16-0.94,0.46
|
||||||
|
c-0.22,0.31-0.33,0.69-0.33,1.14C78.4,29.21,78.51,29.58,78.73,29.88z"/>
|
||||||
|
<path d="M82.93,27.74c0-0.29-0.01-0.6-0.03-0.9h0.46v0.68h0.02c0.04-0.09,0.1-0.18,0.16-0.27c0.06-0.09,0.14-0.17,0.23-0.25
|
||||||
|
c0.09-0.08,0.21-0.14,0.35-0.19s0.31-0.07,0.5-0.07c0.47,0,0.81,0.15,1.01,0.42c0.19,0.27,0.29,0.62,0.29,1.05v2.44h-0.47v-2.33
|
||||||
|
c0-0.36-0.07-0.65-0.2-0.87c-0.15-0.21-0.38-0.31-0.71-0.31c-0.42,0.01-0.71,0.16-0.88,0.45c-0.09,0.14-0.15,0.28-0.19,0.44
|
||||||
|
c-0.04,0.17-0.06,0.33-0.06,0.5v2.12h-0.47V27.74z"/>
|
||||||
|
<path d="M90.25,30.55c-0.36,0.14-0.73,0.21-1.11,0.21c-0.62-0.01-1.07-0.2-1.34-0.58c-0.27-0.37-0.4-0.84-0.4-1.43
|
||||||
|
c0-0.59,0.15-1.08,0.45-1.45c0.29-0.37,0.67-0.55,1.16-0.56c0.54,0.01,0.92,0.2,1.17,0.56c0.24,0.36,0.35,0.81,0.35,1.33v0.24
|
||||||
|
h-2.62c0,0.42,0.11,0.76,0.32,1.03c0.21,0.29,0.52,0.43,0.94,0.44c0.19,0,0.38-0.03,0.58-0.1c0.21-0.05,0.37-0.12,0.49-0.19V30.55
|
||||||
|
z M90.01,28.48c0-0.35-0.07-0.65-0.22-0.92c-0.16-0.26-0.41-0.4-0.76-0.41c-0.35,0.01-0.62,0.15-0.82,0.42
|
||||||
|
c-0.21,0.27-0.31,0.57-0.31,0.91H90.01z"/>
|
||||||
|
<path d="M95.68,30.31c0.33,0,0.61-0.09,0.84-0.26c0.22-0.17,0.33-0.44,0.34-0.81c0-0.25-0.13-0.47-0.38-0.65
|
||||||
|
c-0.11-0.09-0.24-0.17-0.38-0.25s-0.29-0.16-0.44-0.24c-0.15-0.08-0.29-0.18-0.43-0.27c-0.15-0.09-0.28-0.19-0.39-0.3
|
||||||
|
c-0.25-0.21-0.37-0.49-0.38-0.82c0-0.42,0.17-0.76,0.49-1c0.31-0.24,0.7-0.35,1.17-0.36c0.14,0,0.3,0.01,0.48,0.03
|
||||||
|
c0.19,0.03,0.37,0.08,0.55,0.14l-0.08,0.47c-0.25-0.13-0.57-0.19-0.95-0.19c-0.13,0-0.27,0.01-0.4,0.04
|
||||||
|
c-0.13,0.03-0.25,0.08-0.37,0.16c-0.1,0.07-0.19,0.16-0.26,0.27c-0.07,0.12-0.1,0.27-0.1,0.44c0,0.12,0.03,0.24,0.1,0.35
|
||||||
|
c0.07,0.1,0.16,0.2,0.27,0.28c0.11,0.08,0.24,0.17,0.39,0.24c0.14,0.08,0.29,0.16,0.44,0.25c0.31,0.15,0.59,0.34,0.83,0.57
|
||||||
|
c0.11,0.11,0.21,0.24,0.28,0.39c0.06,0.15,0.1,0.32,0.1,0.52c-0.01,0.52-0.19,0.9-0.55,1.13c-0.35,0.23-0.74,0.34-1.17,0.34
|
||||||
|
c-0.51-0.01-0.9-0.08-1.18-0.22L94.52,30C94.82,30.2,95.2,30.31,95.68,30.31z"/>
|
||||||
|
<path d="M100.27,30.67h-0.55l-1.3-3.83h0.52l1.06,3.31h0.02l1.11-3.31h0.5L100.27,30.67z"/>
|
||||||
|
<path d="M103.33,25.82h-0.47v-0.63h0.47V25.82z M102.86,26.84h0.47v3.83h-0.47V26.84z"/>
|
||||||
|
<path d="M104.76,30.27l2.3-3.02h-2.21v-0.41h2.76v0.41l-2.3,3.02h2.3v0.4h-2.85V30.27z"/>
|
||||||
|
<path d="M108.67,30.27l2.3-3.02h-2.21v-0.41h2.76v0.41l-2.3,3.02h2.3v0.4h-2.85V30.27z"/>
|
||||||
|
<path d="M115.51,30.55c-0.36,0.14-0.73,0.21-1.11,0.21c-0.62-0.01-1.07-0.2-1.34-0.58c-0.27-0.37-0.4-0.84-0.4-1.43
|
||||||
|
c0-0.59,0.15-1.08,0.45-1.45c0.29-0.37,0.67-0.55,1.16-0.56c0.54,0.01,0.92,0.2,1.17,0.56c0.24,0.36,0.35,0.81,0.35,1.33v0.24
|
||||||
|
h-2.62c0,0.42,0.11,0.76,0.32,1.03c0.21,0.29,0.52,0.43,0.94,0.44c0.19,0,0.38-0.03,0.58-0.1c0.21-0.05,0.37-0.12,0.49-0.19V30.55
|
||||||
|
z M115.27,28.48c0-0.35-0.07-0.65-0.22-0.92c-0.16-0.26-0.41-0.4-0.76-0.41c-0.35,0.01-0.62,0.15-0.82,0.42
|
||||||
|
c-0.21,0.27-0.31,0.57-0.31,0.91H115.27z"/>
|
||||||
|
<path d="M117.28,27.7c0-0.35-0.01-0.64-0.03-0.85h0.47v0.74h0.01c0.09-0.23,0.22-0.42,0.38-0.58c0.16-0.16,0.36-0.24,0.6-0.25
|
||||||
|
c0.12,0,0.23,0.02,0.33,0.04v0.5c-0.1-0.03-0.22-0.04-0.34-0.04c-0.19,0-0.34,0.05-0.46,0.13c-0.12,0.09-0.22,0.21-0.29,0.37
|
||||||
|
c-0.07,0.15-0.12,0.31-0.15,0.49c-0.04,0.19-0.05,0.37-0.05,0.54v1.89h-0.47V27.7z"/>
|
||||||
|
<path d="M122.56,30.05h-0.02c-0.11,0.23-0.28,0.4-0.5,0.52c-0.23,0.12-0.46,0.18-0.71,0.19c-0.27,0-0.48-0.05-0.65-0.13
|
||||||
|
c-0.17-0.07-0.3-0.17-0.39-0.28c-0.16-0.25-0.23-0.47-0.23-0.67c0-0.32,0.08-0.57,0.23-0.76c0.15-0.19,0.34-0.32,0.58-0.4
|
||||||
|
c0.23-0.08,0.49-0.14,0.77-0.17c0.27-0.02,0.53-0.02,0.78-0.02h0.09v-0.19c0.01-0.66-0.28-0.98-0.87-0.98
|
||||||
|
c-0.4-0.01-0.77,0.1-1.12,0.31v-0.46c0.35-0.17,0.73-0.25,1.12-0.26c0.9-0.01,1.35,0.46,1.34,1.42v1.69c0,0.29,0.01,0.56,0.04,0.8
|
||||||
|
h-0.46V30.05z M122.51,28.74h-0.14c-0.21,0-0.41,0.01-0.61,0.02c-0.22,0.02-0.41,0.06-0.58,0.13c-0.18,0.06-0.31,0.15-0.42,0.28
|
||||||
|
c-0.12,0.12-0.17,0.29-0.17,0.5c0,0.25,0.08,0.42,0.24,0.52c0.15,0.11,0.33,0.17,0.55,0.17c0.27,0,0.49-0.06,0.65-0.17
|
||||||
|
c0.15-0.1,0.27-0.23,0.34-0.38c0.08-0.15,0.12-0.31,0.13-0.46c0.01-0.15,0.02-0.28,0.02-0.38V28.74z"/>
|
||||||
|
<path d="M36.25,36.33c-0.21-0.02-0.42-0.04-0.61-0.04c-0.68,0.01-1.2,0.22-1.57,0.64c-0.37,0.42-0.56,0.96-0.56,1.62
|
||||||
|
c0,0.67,0.18,1.21,0.55,1.62c0.36,0.42,0.88,0.63,1.57,0.64c0.18,0,0.38-0.02,0.61-0.05c0.22-0.03,0.41-0.09,0.56-0.17l0.03,0.45
|
||||||
|
c-0.16,0.08-0.35,0.14-0.58,0.17c-0.23,0.03-0.44,0.05-0.62,0.05c-0.83-0.01-1.48-0.26-1.94-0.75c-0.47-0.48-0.7-1.14-0.7-1.96
|
||||||
|
c0-0.81,0.24-1.46,0.71-1.96c0.46-0.49,1.11-0.74,1.93-0.75c0.17,0,0.38,0.01,0.62,0.04c0.24,0.03,0.43,0.08,0.58,0.16l-0.03,0.48
|
||||||
|
C36.65,36.43,36.46,36.36,36.25,36.33z"/>
|
||||||
|
<path d="M38.71,37.86c0.29-0.4,0.74-0.6,1.35-0.61c0.62,0.01,1.08,0.21,1.37,0.61c0.28,0.39,0.42,0.85,0.42,1.4
|
||||||
|
c0,0.54-0.14,1-0.42,1.39c-0.29,0.4-0.75,0.6-1.37,0.61c-0.61-0.01-1.06-0.21-1.35-0.61c-0.29-0.39-0.44-0.85-0.44-1.39
|
||||||
|
C38.28,38.71,38.42,38.24,38.71,37.86z M39.13,40.38c0.21,0.31,0.52,0.47,0.94,0.47c0.42,0,0.73-0.16,0.95-0.47
|
||||||
|
c0.21-0.29,0.31-0.67,0.31-1.12c0-0.45-0.1-0.83-0.31-1.14c-0.22-0.3-0.54-0.45-0.95-0.46c-0.42,0-0.73,0.16-0.94,0.46
|
||||||
|
c-0.22,0.31-0.33,0.69-0.33,1.14C38.8,39.71,38.91,40.08,39.13,40.38z"/>
|
||||||
|
<path d="M43.33,38.24c0-0.29-0.01-0.6-0.03-0.9h0.46v0.68h0.02c0.04-0.09,0.1-0.18,0.16-0.27c0.06-0.09,0.14-0.17,0.23-0.25
|
||||||
|
c0.09-0.08,0.21-0.14,0.35-0.19s0.31-0.07,0.5-0.07c0.47,0,0.81,0.15,1.01,0.42c0.19,0.27,0.29,0.62,0.29,1.05v2.44h-0.47v-2.33
|
||||||
|
c0-0.36-0.07-0.65-0.2-0.87c-0.15-0.21-0.38-0.31-0.71-0.31c-0.42,0.01-0.71,0.16-0.88,0.45c-0.09,0.14-0.15,0.28-0.19,0.44
|
||||||
|
c-0.04,0.17-0.06,0.33-0.06,0.5v2.12h-0.47V38.24z"/>
|
||||||
|
<path d="M48.4,37.75h-0.77v-0.41h0.77v-0.28c0-0.21,0.01-0.4,0.03-0.6c0.01-0.19,0.05-0.36,0.11-0.51
|
||||||
|
c0.06-0.15,0.17-0.28,0.31-0.37c0.13-0.09,0.32-0.13,0.56-0.13c0.08,0,0.16,0,0.25,0.01c0.08,0.02,0.15,0.04,0.2,0.07l-0.03,0.41
|
||||||
|
c-0.1-0.05-0.23-0.08-0.38-0.08c-0.15,0-0.27,0.04-0.35,0.1c-0.08,0.08-0.14,0.18-0.17,0.29c-0.03,0.12-0.04,0.24-0.04,0.37
|
||||||
|
c0,0.13-0.01,0.27-0.01,0.39v0.33h0.86v0.41h-0.86v3.42H48.4V37.75z"/>
|
||||||
|
<path d="M53.73,41.05c-0.36,0.14-0.73,0.21-1.11,0.21c-0.62-0.01-1.07-0.2-1.34-0.58c-0.27-0.37-0.4-0.84-0.4-1.43
|
||||||
|
c0-0.59,0.15-1.08,0.45-1.45c0.29-0.37,0.67-0.55,1.16-0.56c0.54,0.01,0.92,0.2,1.17,0.56c0.24,0.36,0.35,0.81,0.35,1.33v0.24
|
||||||
|
H51.4c0,0.42,0.11,0.76,0.32,1.03c0.21,0.29,0.52,0.43,0.94,0.44c0.19,0,0.38-0.03,0.58-0.1c0.21-0.05,0.37-0.12,0.49-0.19V41.05z
|
||||||
|
M53.5,38.98c0-0.35-0.07-0.65-0.22-0.92c-0.16-0.26-0.41-0.4-0.76-0.41c-0.35,0.01-0.62,0.15-0.82,0.42
|
||||||
|
c-0.21,0.27-0.31,0.57-0.31,0.91H53.5z"/>
|
||||||
|
<path d="M58.53,41.17h-0.47v-0.61h-0.02c-0.25,0.47-0.65,0.7-1.19,0.7c-0.52-0.01-0.92-0.2-1.18-0.58
|
||||||
|
c-0.27-0.38-0.4-0.85-0.4-1.43c-0.01-0.59,0.12-1.07,0.37-1.44c0.25-0.37,0.65-0.56,1.21-0.56c0.19,0,0.35,0.03,0.5,0.08
|
||||||
|
c0.15,0.06,0.27,0.12,0.36,0.21c0.2,0.18,0.31,0.32,0.34,0.44h0.02v-2.44h0.47V41.17z M55.84,39.8c0.04,0.19,0.1,0.37,0.18,0.53
|
||||||
|
c0.09,0.15,0.21,0.27,0.35,0.37c0.14,0.1,0.32,0.16,0.55,0.16c0.21,0,0.39-0.05,0.54-0.16c0.14-0.09,0.25-0.22,0.34-0.38
|
||||||
|
c0.17-0.34,0.25-0.69,0.25-1.06c0-0.18-0.02-0.36-0.05-0.55c-0.04-0.18-0.1-0.35-0.2-0.51c-0.09-0.16-0.21-0.29-0.34-0.39
|
||||||
|
c-0.15-0.09-0.33-0.14-0.54-0.14c-0.23,0-0.41,0.05-0.55,0.14c-0.15,0.09-0.26,0.22-0.35,0.38c-0.08,0.15-0.14,0.32-0.18,0.51
|
||||||
|
c-0.04,0.19-0.05,0.38-0.05,0.57C55.79,39.43,55.81,39.62,55.84,39.8z"/>
|
||||||
|
<path d="M62.82,41.05c-0.36,0.14-0.73,0.21-1.11,0.21c-0.62-0.01-1.07-0.2-1.34-0.58c-0.27-0.37-0.4-0.84-0.4-1.43
|
||||||
|
c0-0.59,0.15-1.08,0.45-1.45c0.29-0.37,0.67-0.55,1.16-0.56c0.54,0.01,0.92,0.2,1.17,0.56c0.24,0.36,0.35,0.81,0.35,1.33v0.24
|
||||||
|
h-2.62c0,0.42,0.11,0.76,0.32,1.03c0.21,0.29,0.52,0.43,0.94,0.44c0.19,0,0.38-0.03,0.58-0.1c0.21-0.05,0.37-0.12,0.49-0.19V41.05
|
||||||
|
z M62.59,38.98c0-0.35-0.07-0.65-0.22-0.92c-0.16-0.26-0.41-0.4-0.76-0.41c-0.35,0.01-0.62,0.15-0.82,0.42
|
||||||
|
c-0.21,0.27-0.31,0.57-0.31,0.91H62.59z"/>
|
||||||
|
<path d="M64.59,38.2c0-0.35-0.01-0.64-0.03-0.85h0.47v0.74h0.01c0.09-0.23,0.22-0.42,0.38-0.58c0.16-0.16,0.36-0.24,0.6-0.25
|
||||||
|
c0.12,0,0.23,0.02,0.33,0.04v0.5c-0.1-0.03-0.22-0.04-0.34-0.04c-0.19,0-0.34,0.05-0.46,0.13c-0.12,0.09-0.22,0.21-0.29,0.37
|
||||||
|
c-0.07,0.15-0.12,0.31-0.15,0.49c-0.04,0.19-0.05,0.37-0.05,0.54v1.89h-0.47V38.2z"/>
|
||||||
|
<path d="M69.87,40.55h-0.02c-0.11,0.23-0.28,0.4-0.5,0.52c-0.23,0.12-0.46,0.18-0.71,0.19c-0.27,0-0.48-0.05-0.65-0.13
|
||||||
|
c-0.17-0.07-0.3-0.17-0.39-0.28c-0.16-0.25-0.23-0.47-0.23-0.67c0-0.32,0.08-0.57,0.23-0.76c0.15-0.19,0.34-0.32,0.58-0.4
|
||||||
|
c0.23-0.08,0.49-0.14,0.77-0.17c0.27-0.02,0.53-0.02,0.78-0.02h0.09v-0.19c0.01-0.66-0.28-0.98-0.87-0.98
|
||||||
|
c-0.4-0.01-0.77,0.1-1.12,0.31v-0.46c0.35-0.17,0.73-0.25,1.12-0.26c0.9-0.01,1.35,0.46,1.34,1.42v1.69c0,0.29,0.01,0.56,0.04,0.8
|
||||||
|
h-0.46V40.55z M69.82,39.24h-0.14c-0.21,0-0.41,0.01-0.61,0.02c-0.22,0.02-0.41,0.06-0.58,0.13c-0.18,0.06-0.31,0.15-0.42,0.28
|
||||||
|
c-0.12,0.12-0.17,0.29-0.17,0.5c0,0.25,0.08,0.42,0.24,0.52c0.15,0.11,0.33,0.17,0.55,0.17c0.27,0,0.49-0.06,0.65-0.17
|
||||||
|
c0.15-0.1,0.27-0.23,0.34-0.38c0.08-0.15,0.12-0.31,0.13-0.46c0.01-0.15,0.02-0.28,0.02-0.38V39.24z"/>
|
||||||
|
<path d="M71.65,40.77l2.3-3.02h-2.21v-0.41h2.76v0.41l-2.3,3.02h2.3v0.4h-2.85V40.77z"/>
|
||||||
|
<path d="M76.39,36.32h-0.47v-0.63h0.47V36.32z M75.92,37.34h0.47v3.83h-0.47V37.34z"/>
|
||||||
|
<path d="M81.16,40.27c-0.01,0.29,0,0.59,0.03,0.9h-0.46v-0.68h-0.02c-0.03,0.08-0.08,0.17-0.14,0.25
|
||||||
|
c-0.06,0.09-0.14,0.18-0.23,0.26c-0.09,0.07-0.21,0.13-0.35,0.18c-0.14,0.06-0.31,0.08-0.51,0.08c-0.46,0-0.8-0.15-1-0.42
|
||||||
|
c-0.21-0.27-0.31-0.62-0.3-1.05v-2.45h0.47v2.33c0,0.37,0.07,0.65,0.22,0.85c0.14,0.22,0.37,0.33,0.69,0.33
|
||||||
|
c0.21,0,0.4-0.04,0.55-0.14c0.15-0.08,0.27-0.19,0.35-0.33c0.09-0.14,0.15-0.29,0.19-0.45c0.03-0.16,0.05-0.32,0.05-0.48v-2.12
|
||||||
|
h0.47V40.27z"/>
|
||||||
|
<path d="M82.93,38.24c0-0.29-0.01-0.6-0.03-0.9h0.46v0.68h0.02c0.04-0.09,0.1-0.18,0.16-0.27c0.06-0.09,0.14-0.17,0.23-0.25
|
||||||
|
c0.09-0.08,0.21-0.14,0.35-0.19s0.31-0.07,0.5-0.07c0.47,0,0.81,0.15,1.01,0.42c0.19,0.27,0.29,0.62,0.29,1.05v2.44h-0.47v-2.33
|
||||||
|
c0-0.36-0.07-0.65-0.2-0.87c-0.15-0.21-0.38-0.31-0.71-0.31c-0.42,0.01-0.71,0.16-0.88,0.45c-0.09,0.14-0.15,0.28-0.19,0.44
|
||||||
|
c-0.04,0.17-0.06,0.33-0.06,0.5v2.12h-0.47V38.24z"/>
|
||||||
|
<path d="M90.98,40.85c0.23,0,0.44-0.06,0.6-0.19c0.16-0.12,0.24-0.28,0.25-0.5c0-0.23-0.1-0.4-0.28-0.53
|
||||||
|
c-0.18-0.12-0.39-0.24-0.64-0.34c-0.12-0.05-0.23-0.11-0.33-0.17s-0.21-0.13-0.3-0.2c-0.08-0.08-0.16-0.17-0.21-0.28
|
||||||
|
c-0.06-0.1-0.08-0.22-0.08-0.35c0-0.38,0.13-0.65,0.39-0.81c0.25-0.15,0.53-0.23,0.86-0.23c0.11,0,0.25,0.01,0.43,0.03
|
||||||
|
c0.17,0.03,0.35,0.08,0.52,0.14l-0.04,0.41c-0.28-0.11-0.56-0.17-0.85-0.18c-0.25,0-0.44,0.04-0.58,0.13
|
||||||
|
c-0.08,0.04-0.13,0.11-0.17,0.19c-0.04,0.08-0.07,0.19-0.07,0.31c0,0.08,0.03,0.16,0.08,0.23c0.06,0.06,0.13,0.12,0.22,0.18
|
||||||
|
c0.09,0.05,0.19,0.1,0.31,0.16c0.11,0.05,0.23,0.1,0.34,0.17c0.25,0.1,0.47,0.25,0.65,0.42c0.19,0.18,0.28,0.42,0.29,0.73
|
||||||
|
c0,0.2-0.04,0.37-0.12,0.5c-0.08,0.14-0.19,0.25-0.32,0.34c-0.28,0.17-0.58,0.25-0.89,0.25c-0.37,0-0.73-0.06-1.07-0.18l0.04-0.47
|
||||||
|
C90.27,40.77,90.61,40.85,90.98,40.85z"/>
|
||||||
|
<path d="M95.11,41.17h-0.55l-1.3-3.83h0.52l1.06,3.31h0.02l1.11-3.31h0.5L95.11,41.17z"/>
|
||||||
|
<path d="M98.17,36.32h-0.47v-0.63h0.47V36.32z M97.69,37.34h0.47v3.83h-0.47V37.34z"/>
|
||||||
|
<path d="M99.59,40.77l2.3-3.02h-2.21v-0.41h2.76v0.41l-2.3,3.02h2.3v0.4h-2.85V40.77z"/>
|
||||||
|
<path d="M103.86,38.2c0-0.35-0.01-0.64-0.03-0.85h0.47v0.74h0.01c0.09-0.23,0.22-0.42,0.38-0.58c0.16-0.16,0.36-0.24,0.6-0.25
|
||||||
|
c0.12,0,0.23,0.02,0.33,0.04v0.5c-0.1-0.03-0.22-0.04-0.34-0.04c-0.19,0-0.34,0.05-0.46,0.13c-0.12,0.09-0.22,0.21-0.29,0.37
|
||||||
|
c-0.07,0.15-0.12,0.31-0.15,0.49c-0.04,0.19-0.05,0.37-0.05,0.54v1.89h-0.47V38.2z"/>
|
||||||
|
<path d="M109.14,40.55h-0.02c-0.11,0.23-0.28,0.4-0.5,0.52c-0.23,0.12-0.46,0.18-0.71,0.19c-0.27,0-0.48-0.05-0.65-0.13
|
||||||
|
c-0.17-0.07-0.3-0.17-0.39-0.28c-0.16-0.25-0.23-0.47-0.23-0.67c0-0.32,0.08-0.57,0.23-0.76c0.15-0.19,0.34-0.32,0.58-0.4
|
||||||
|
c0.23-0.08,0.49-0.14,0.77-0.17c0.27-0.02,0.53-0.02,0.78-0.02h0.09v-0.19c0.01-0.66-0.28-0.98-0.87-0.98
|
||||||
|
c-0.4-0.01-0.77,0.1-1.12,0.31v-0.46c0.35-0.17,0.73-0.25,1.12-0.26c0.9-0.01,1.35,0.46,1.34,1.42v1.69c0,0.29,0.01,0.56,0.04,0.8
|
||||||
|
h-0.46V40.55z M109.09,39.24h-0.14c-0.21,0-0.41,0.01-0.61,0.02c-0.22,0.02-0.41,0.06-0.58,0.13c-0.18,0.06-0.31,0.15-0.42,0.28
|
||||||
|
c-0.12,0.12-0.17,0.29-0.17,0.5c0,0.25,0.08,0.42,0.24,0.52c0.15,0.11,0.33,0.17,0.55,0.17c0.27,0,0.49-0.06,0.65-0.17
|
||||||
|
c0.15-0.1,0.27-0.23,0.34-0.38c0.08-0.15,0.12-0.31,0.13-0.46c0.01-0.15,0.02-0.28,0.02-0.38V39.24z"/>
|
||||||
|
<path d="M34.24,61.81c0.33,0,0.61-0.09,0.84-0.26c0.22-0.17,0.33-0.44,0.34-0.81c0-0.25-0.13-0.47-0.38-0.65
|
||||||
|
c-0.11-0.09-0.24-0.17-0.38-0.25s-0.29-0.16-0.44-0.24c-0.15-0.08-0.29-0.18-0.43-0.27c-0.15-0.09-0.28-0.19-0.39-0.3
|
||||||
|
c-0.25-0.21-0.37-0.49-0.38-0.82c0-0.42,0.17-0.76,0.49-1c0.31-0.24,0.7-0.35,1.17-0.36c0.14,0,0.3,0.01,0.48,0.03
|
||||||
|
c0.19,0.03,0.37,0.08,0.55,0.14l-0.08,0.47c-0.25-0.13-0.57-0.19-0.95-0.19c-0.13,0-0.27,0.01-0.4,0.04
|
||||||
|
c-0.13,0.03-0.25,0.08-0.37,0.16c-0.1,0.07-0.19,0.16-0.26,0.27c-0.07,0.12-0.1,0.27-0.1,0.44c0,0.12,0.03,0.24,0.1,0.35
|
||||||
|
c0.07,0.1,0.16,0.2,0.27,0.28c0.11,0.08,0.24,0.17,0.39,0.24c0.14,0.08,0.29,0.16,0.44,0.25c0.31,0.15,0.59,0.34,0.83,0.57
|
||||||
|
c0.11,0.11,0.21,0.24,0.28,0.39c0.06,0.15,0.1,0.32,0.1,0.52c-0.01,0.52-0.19,0.9-0.55,1.13c-0.35,0.23-0.74,0.34-1.17,0.34
|
||||||
|
c-0.51-0.01-0.9-0.08-1.18-0.22l0.05-0.53C33.38,61.7,33.76,61.81,34.24,61.81z"/>
|
||||||
|
<path d="M41.44,62.17h-0.57l-1.04-3.31h-0.02l-1.04,3.31H38.2l-1.23-3.83h0.52l1.01,3.31h0.01l1.06-3.31h0.57l1.01,3.31h0.02
|
||||||
|
l1.06-3.31h0.47L41.44,62.17z"/>
|
||||||
|
<path d="M44.4,57.32h-0.47v-0.63h0.47V57.32z M43.93,58.34h0.47v3.83h-0.47V58.34z"/>
|
||||||
|
<path d="M46.88,61.85c0.23,0,0.44-0.06,0.6-0.19c0.16-0.12,0.24-0.28,0.25-0.5c0-0.23-0.1-0.4-0.28-0.53
|
||||||
|
c-0.18-0.12-0.39-0.24-0.64-0.34c-0.12-0.05-0.23-0.11-0.33-0.17s-0.21-0.13-0.3-0.2c-0.08-0.08-0.16-0.17-0.21-0.28
|
||||||
|
c-0.06-0.1-0.08-0.22-0.08-0.35c0-0.38,0.13-0.65,0.39-0.81c0.25-0.15,0.53-0.23,0.86-0.23c0.11,0,0.25,0.01,0.43,0.03
|
||||||
|
c0.17,0.03,0.35,0.08,0.52,0.14l-0.04,0.41c-0.28-0.11-0.56-0.17-0.85-0.18c-0.25,0-0.44,0.04-0.58,0.13
|
||||||
|
c-0.08,0.04-0.13,0.11-0.17,0.19c-0.04,0.08-0.07,0.19-0.07,0.31c0,0.08,0.03,0.16,0.08,0.23c0.06,0.06,0.13,0.12,0.22,0.18
|
||||||
|
c0.09,0.05,0.19,0.1,0.31,0.16c0.11,0.05,0.23,0.1,0.34,0.17c0.25,0.1,0.47,0.25,0.65,0.42c0.19,0.18,0.28,0.42,0.29,0.73
|
||||||
|
c0,0.2-0.04,0.37-0.12,0.5c-0.08,0.14-0.19,0.25-0.32,0.34c-0.28,0.17-0.58,0.25-0.89,0.25c-0.37,0-0.73-0.06-1.07-0.18l0.04-0.47
|
||||||
|
C46.17,61.77,46.51,61.85,46.88,61.85z"/>
|
||||||
|
<path d="M50.38,61.85c0.23,0,0.44-0.06,0.6-0.19c0.16-0.12,0.24-0.28,0.25-0.5c0-0.23-0.1-0.4-0.28-0.53
|
||||||
|
c-0.18-0.12-0.39-0.24-0.64-0.34c-0.12-0.05-0.23-0.11-0.33-0.17s-0.21-0.13-0.3-0.2c-0.08-0.08-0.16-0.17-0.21-0.28
|
||||||
|
c-0.06-0.1-0.08-0.22-0.08-0.35c0-0.38,0.13-0.65,0.39-0.81c0.25-0.15,0.53-0.23,0.86-0.23c0.11,0,0.25,0.01,0.43,0.03
|
||||||
|
c0.17,0.03,0.35,0.08,0.52,0.14l-0.04,0.41c-0.28-0.11-0.56-0.17-0.85-0.18c-0.25,0-0.44,0.04-0.58,0.13
|
||||||
|
c-0.08,0.04-0.13,0.11-0.17,0.19c-0.04,0.08-0.07,0.19-0.07,0.31c0,0.08,0.03,0.16,0.08,0.23c0.06,0.06,0.13,0.12,0.22,0.18
|
||||||
|
c0.09,0.05,0.19,0.1,0.31,0.16c0.11,0.05,0.23,0.1,0.34,0.17c0.25,0.1,0.47,0.25,0.65,0.42c0.19,0.18,0.28,0.42,0.29,0.73
|
||||||
|
c0,0.2-0.04,0.37-0.12,0.5c-0.08,0.14-0.19,0.25-0.32,0.34c-0.28,0.17-0.58,0.25-0.89,0.25c-0.37,0-0.73-0.06-1.07-0.18l0.04-0.47
|
||||||
|
C49.68,61.77,50.01,61.85,50.38,61.85z"/>
|
||||||
|
<path d="M58.93,57.33c-0.21-0.02-0.42-0.04-0.61-0.04c-0.68,0.01-1.2,0.22-1.57,0.64c-0.37,0.42-0.56,0.96-0.56,1.62
|
||||||
|
c0,0.67,0.18,1.21,0.55,1.62c0.36,0.42,0.88,0.63,1.57,0.64c0.18,0,0.38-0.02,0.61-0.05c0.22-0.03,0.41-0.09,0.56-0.17l0.03,0.45
|
||||||
|
c-0.16,0.08-0.35,0.14-0.58,0.17c-0.23,0.03-0.44,0.05-0.62,0.05c-0.83-0.01-1.48-0.26-1.94-0.75c-0.47-0.48-0.7-1.14-0.7-1.96
|
||||||
|
c0-0.81,0.24-1.46,0.71-1.96c0.46-0.49,1.11-0.74,1.93-0.75c0.17,0,0.38,0.01,0.62,0.04c0.24,0.03,0.43,0.08,0.58,0.16l-0.03,0.48
|
||||||
|
C59.33,57.43,59.14,57.36,58.93,57.33z"/>
|
||||||
|
<path d="M61.58,58.86c0.29-0.4,0.74-0.6,1.35-0.61c0.62,0.01,1.08,0.21,1.37,0.61c0.28,0.39,0.42,0.85,0.42,1.4
|
||||||
|
c0,0.54-0.14,1-0.42,1.39c-0.29,0.4-0.75,0.6-1.37,0.61c-0.61-0.01-1.06-0.21-1.35-0.61c-0.29-0.39-0.44-0.85-0.44-1.39
|
||||||
|
C61.15,59.71,61.29,59.24,61.58,58.86z M61.99,61.38c0.21,0.31,0.52,0.47,0.94,0.47c0.42,0,0.73-0.16,0.95-0.47
|
||||||
|
c0.21-0.29,0.31-0.67,0.31-1.12c0-0.45-0.1-0.83-0.31-1.14c-0.22-0.3-0.54-0.45-0.95-0.46c-0.42,0-0.73,0.16-0.94,0.46
|
||||||
|
c-0.22,0.31-0.33,0.69-0.33,1.14C61.66,60.71,61.77,61.08,61.99,61.38z"/>
|
||||||
|
<path d="M66.19,59.24c0-0.29-0.01-0.6-0.03-0.9h0.46v0.68h0.02c0.04-0.09,0.1-0.18,0.16-0.27c0.06-0.09,0.14-0.17,0.23-0.25
|
||||||
|
c0.09-0.08,0.21-0.14,0.35-0.19s0.31-0.07,0.5-0.07c0.47,0,0.81,0.15,1.01,0.42c0.19,0.27,0.29,0.62,0.29,1.05v2.44h-0.47v-2.33
|
||||||
|
c0-0.36-0.07-0.65-0.2-0.87c-0.15-0.21-0.38-0.31-0.71-0.31c-0.42,0.01-0.71,0.16-0.88,0.45c-0.09,0.14-0.15,0.28-0.19,0.44
|
||||||
|
c-0.04,0.17-0.06,0.33-0.06,0.5v2.12h-0.47V59.24z"/>
|
||||||
|
<path d="M71.27,58.75H70.5v-0.41h0.77v-0.28c0-0.21,0.01-0.4,0.03-0.6c0.01-0.19,0.05-0.36,0.11-0.51
|
||||||
|
c0.06-0.15,0.17-0.28,0.31-0.37c0.13-0.09,0.32-0.13,0.56-0.13c0.08,0,0.16,0,0.25,0.01c0.08,0.02,0.15,0.04,0.2,0.07l-0.03,0.41
|
||||||
|
c-0.1-0.05-0.23-0.08-0.38-0.08c-0.15,0-0.27,0.04-0.35,0.1c-0.08,0.08-0.14,0.18-0.17,0.29c-0.03,0.12-0.04,0.24-0.04,0.37
|
||||||
|
c0,0.13-0.01,0.27-0.01,0.39v0.33h0.86v0.41h-0.86v3.42h-0.47V58.75z"/>
|
||||||
|
<path d="M76.6,62.05c-0.36,0.14-0.73,0.21-1.11,0.21c-0.62-0.01-1.07-0.2-1.34-0.58c-0.27-0.37-0.4-0.84-0.4-1.43
|
||||||
|
c0-0.59,0.15-1.08,0.45-1.45c0.29-0.37,0.67-0.55,1.16-0.56c0.54,0.01,0.92,0.2,1.17,0.56c0.24,0.36,0.35,0.81,0.35,1.33v0.24
|
||||||
|
h-2.62c0,0.42,0.11,0.76,0.32,1.03c0.21,0.29,0.52,0.43,0.94,0.44c0.19,0,0.38-0.03,0.58-0.1c0.21-0.05,0.37-0.12,0.49-0.19V62.05
|
||||||
|
z M76.36,59.98c0-0.35-0.07-0.65-0.22-0.92c-0.16-0.26-0.41-0.4-0.76-0.41c-0.35,0.01-0.62,0.15-0.82,0.42
|
||||||
|
c-0.21,0.27-0.31,0.57-0.31,0.91H76.36z"/>
|
||||||
|
<path d="M81.4,62.17h-0.47v-0.61h-0.02c-0.25,0.47-0.65,0.7-1.19,0.7c-0.52-0.01-0.92-0.2-1.18-0.58c-0.27-0.38-0.4-0.85-0.4-1.43
|
||||||
|
c-0.01-0.59,0.12-1.07,0.37-1.44c0.25-0.37,0.65-0.56,1.21-0.56c0.19,0,0.35,0.03,0.5,0.08c0.15,0.06,0.27,0.12,0.36,0.21
|
||||||
|
c0.2,0.18,0.31,0.32,0.34,0.44h0.02v-2.44h0.47V62.17z M78.71,60.8c0.04,0.19,0.1,0.37,0.18,0.53c0.09,0.15,0.21,0.27,0.35,0.37
|
||||||
|
c0.14,0.1,0.32,0.16,0.55,0.16c0.21,0,0.39-0.05,0.54-0.16c0.14-0.09,0.25-0.22,0.34-0.38c0.17-0.34,0.25-0.69,0.25-1.06
|
||||||
|
c0-0.18-0.02-0.36-0.05-0.55c-0.04-0.18-0.1-0.35-0.2-0.51c-0.09-0.16-0.21-0.29-0.34-0.39c-0.15-0.09-0.33-0.14-0.54-0.14
|
||||||
|
c-0.23,0-0.41,0.05-0.55,0.14c-0.15,0.09-0.26,0.22-0.35,0.38c-0.08,0.15-0.14,0.32-0.18,0.51c-0.04,0.19-0.05,0.38-0.05,0.57
|
||||||
|
C78.66,60.43,78.68,60.62,78.71,60.8z"/>
|
||||||
|
<path d="M85.69,62.05c-0.36,0.14-0.73,0.21-1.11,0.21c-0.62-0.01-1.07-0.2-1.34-0.58c-0.27-0.37-0.4-0.84-0.4-1.43
|
||||||
|
c0-0.59,0.15-1.08,0.45-1.45c0.29-0.37,0.67-0.55,1.16-0.56c0.54,0.01,0.92,0.2,1.17,0.56c0.24,0.36,0.35,0.81,0.35,1.33v0.24
|
||||||
|
h-2.62c0,0.42,0.11,0.76,0.32,1.03c0.21,0.29,0.52,0.43,0.94,0.44c0.19,0,0.38-0.03,0.58-0.1c0.21-0.05,0.37-0.12,0.49-0.19V62.05
|
||||||
|
z M85.45,59.98c0-0.35-0.07-0.65-0.22-0.92c-0.16-0.26-0.41-0.4-0.76-0.41c-0.35,0.01-0.62,0.15-0.82,0.42
|
||||||
|
c-0.21,0.27-0.31,0.57-0.31,0.91H85.45z"/>
|
||||||
|
<path d="M87.46,59.2c0-0.35-0.01-0.64-0.03-0.85h0.47v0.74h0.01c0.09-0.23,0.22-0.42,0.38-0.58c0.16-0.16,0.36-0.24,0.6-0.25
|
||||||
|
c0.12,0,0.23,0.02,0.33,0.04v0.5c-0.1-0.03-0.22-0.04-0.34-0.04c-0.19,0-0.34,0.05-0.46,0.13c-0.12,0.09-0.22,0.21-0.29,0.37
|
||||||
|
c-0.07,0.15-0.12,0.31-0.15,0.49c-0.04,0.19-0.05,0.37-0.05,0.54v1.89h-0.47V59.2z"/>
|
||||||
|
<path d="M92.74,61.55h-0.02c-0.11,0.23-0.28,0.4-0.5,0.52c-0.23,0.12-0.46,0.18-0.71,0.19c-0.27,0-0.48-0.05-0.65-0.13
|
||||||
|
c-0.17-0.07-0.3-0.17-0.39-0.28c-0.16-0.25-0.23-0.47-0.23-0.67c0-0.32,0.08-0.57,0.23-0.76c0.15-0.19,0.34-0.32,0.58-0.4
|
||||||
|
c0.23-0.08,0.49-0.14,0.77-0.17c0.27-0.02,0.53-0.02,0.78-0.02h0.09v-0.19c0.01-0.66-0.28-0.98-0.87-0.98
|
||||||
|
c-0.4-0.01-0.77,0.1-1.12,0.31v-0.46c0.35-0.17,0.73-0.25,1.12-0.26c0.9-0.01,1.35,0.46,1.34,1.42v1.69c0,0.29,0.01,0.56,0.04,0.8
|
||||||
|
h-0.46V61.55z M92.69,60.24h-0.14c-0.21,0-0.41,0.01-0.61,0.02c-0.22,0.02-0.41,0.06-0.58,0.13c-0.18,0.06-0.31,0.15-0.42,0.28
|
||||||
|
c-0.12,0.12-0.17,0.29-0.17,0.5c0,0.25,0.08,0.42,0.24,0.52c0.15,0.11,0.33,0.17,0.55,0.17c0.27,0,0.49-0.06,0.65-0.17
|
||||||
|
c0.15-0.1,0.27-0.23,0.34-0.38c0.08-0.15,0.12-0.31,0.13-0.46c0.01-0.15,0.02-0.28,0.02-0.38V60.24z"/>
|
||||||
|
<path d="M96.52,58.75h-0.87v2.48c0,0.17,0.04,0.32,0.12,0.44c0.07,0.12,0.2,0.19,0.39,0.19c0.17,0,0.31-0.03,0.44-0.09l0.03,0.39
|
||||||
|
c-0.06,0.02-0.13,0.04-0.23,0.07c-0.11,0.02-0.22,0.04-0.35,0.04c-0.21,0-0.37-0.03-0.49-0.1c-0.12-0.07-0.2-0.16-0.26-0.28
|
||||||
|
c-0.05-0.12-0.08-0.25-0.1-0.4c-0.01-0.15-0.02-0.31-0.02-0.49v-2.23h-0.75v-0.41h0.75v-0.92l0.47-0.17v1.09h0.87V58.75z"/>
|
||||||
|
<path d="M98.43,57.32h-0.47v-0.63h0.47V57.32z M97.96,58.34h0.47v3.83h-0.47V58.34z"/>
|
||||||
|
<path d="M100.35,58.86c0.29-0.4,0.74-0.6,1.35-0.61c0.62,0.01,1.08,0.21,1.37,0.61c0.28,0.39,0.42,0.85,0.42,1.4
|
||||||
|
c0,0.54-0.14,1-0.42,1.39c-0.29,0.4-0.75,0.6-1.37,0.61c-0.61-0.01-1.06-0.21-1.35-0.61c-0.29-0.39-0.44-0.85-0.44-1.39
|
||||||
|
C99.91,59.71,100.06,59.24,100.35,58.86z M100.76,61.38c0.21,0.31,0.52,0.47,0.94,0.47c0.42,0,0.73-0.16,0.95-0.47
|
||||||
|
c0.21-0.29,0.31-0.67,0.31-1.12c0-0.45-0.1-0.83-0.31-1.14c-0.22-0.3-0.54-0.45-0.95-0.46c-0.42,0-0.73,0.16-0.94,0.46
|
||||||
|
c-0.22,0.31-0.33,0.69-0.33,1.14C100.43,60.71,100.54,61.08,100.76,61.38z"/>
|
||||||
|
<path d="M104.96,59.24c0-0.29-0.01-0.6-0.03-0.9h0.46v0.68h0.02c0.04-0.09,0.1-0.18,0.16-0.27c0.06-0.09,0.14-0.17,0.23-0.25
|
||||||
|
c0.09-0.08,0.21-0.14,0.35-0.19s0.31-0.07,0.5-0.07c0.47,0,0.81,0.15,1.01,0.42c0.19,0.27,0.29,0.62,0.29,1.05v2.44h-0.47v-2.33
|
||||||
|
c0-0.36-0.07-0.65-0.2-0.87c-0.15-0.21-0.38-0.31-0.71-0.31c-0.42,0.01-0.71,0.16-0.88,0.45c-0.09,0.14-0.15,0.28-0.19,0.44
|
||||||
|
c-0.04,0.17-0.06,0.33-0.06,0.5v2.12h-0.47V59.24z"/>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
<path class="st0" d="M24.49,4.2c0,0-3.97-1.74-10.61-1.74h0C7.23,2.46,3.26,4.2,3.26,4.2s-0.36,7.7,1.15,12.05
|
||||||
|
c2.66,7.65,9.46,9.8,9.46,9.8h0h0c0,0,6.8-2.15,9.46-9.8C24.85,11.89,24.49,4.2,24.49,4.2z"/>
|
||||||
|
</g>
|
||||||
|
<polygon class="st1" points="20.93,10.83 20.93,15.07 15.99,15.07 15.99,20.02 11.75,20.02 11.75,15.07 6.8,15.07 6.8,10.83
|
||||||
|
11.75,10.83 11.75,5.89 15.98,5.89 15.99,10.83 "/>
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 52 KiB |
BIN
report/resources/img/simaria_logo.png
Normal file
BIN
report/resources/img/simaria_logo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 40 KiB |
94
report/self-assessment/remi.typ
Normal file
94
report/self-assessment/remi.typ
Normal file
@@ -0,0 +1,94 @@
|
|||||||
|
//
|
||||||
|
// Description: Main document to stitch everything together
|
||||||
|
//
|
||||||
|
#import "/metadata.typ": *
|
||||||
|
#import "/tail/bibliography.typ": *
|
||||||
|
#import "/tail/glossary.typ": *
|
||||||
|
#import "/resources/mse-title-page.typ": *
|
||||||
|
#show:make-glossary
|
||||||
|
#register-glossary(entry-list)
|
||||||
|
#set text(region: "gb")
|
||||||
|
|
||||||
|
//-------------------------------------
|
||||||
|
// Template config
|
||||||
|
//
|
||||||
|
#show: thesis.with(
|
||||||
|
option: option + (type: "final"),
|
||||||
|
doc: doc,
|
||||||
|
school: school,
|
||||||
|
date: date,
|
||||||
|
tableof: (toc: false),
|
||||||
|
logos: logos,
|
||||||
|
custom-title-page: mse-title-page(
|
||||||
|
title: [Self-assessment],
|
||||||
|
subtitle: [Team: Pleeeeein deeeee eeeeeeeeeeeeeeeeee],
|
||||||
|
authors: (
|
||||||
|
(name: "Rémi Heredero"),
|
||||||
|
),
|
||||||
|
date: date,
|
||||||
|
),
|
||||||
|
)
|
||||||
|
|
||||||
|
// #show "e": "ee"
|
||||||
|
|
||||||
|
//-------------------------------------
|
||||||
|
// Content
|
||||||
|
//
|
||||||
|
|
||||||
|
/*
|
||||||
|
Un rapport d'auto-évaluation doit dans le grandes lignes :
|
||||||
|
- Reprendre les points qui avaient été annoncé lors de la définition du projet, est-ce que les objectifs et buts de formations fixés en début de projets on été atteints.
|
||||||
|
- Evoquer votre role dans l'équipe, les compétences que vous avez pu mettre à disposition, et celles qui vous ont fait défaut.
|
||||||
|
- Lister les gains en compétences que vous ressentez après ce projet.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#show heading.where(level: 1): (it) => {
|
||||||
|
set text(size: huge)
|
||||||
|
set block(above: 1.2em, below: 1.0em)
|
||||||
|
if it.numbering != none {
|
||||||
|
let num = numbering(it.numbering, ..counter(heading).at(it.location()))
|
||||||
|
let prefix = num + h(0.5em) + text(code-border)[|] + h(0.5em)
|
||||||
|
unshift-prefix(prefix, it.body)
|
||||||
|
} else {
|
||||||
|
it
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#show heading.where(level: 2): (it) => {
|
||||||
|
if it.numbering != none {
|
||||||
|
let num = numbering(it.numbering, ..counter(heading).at(it.location()))
|
||||||
|
unshift-prefix(num + h(0.8em), it.body)
|
||||||
|
} else {
|
||||||
|
it
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
= Introduction
|
||||||
|
|
||||||
|
This report is a self-assessment provided alongside the team report. It is meant to be a personal reflection on the project, and should be read after the team report.
|
||||||
|
|
||||||
|
I want to be upfront, as hinted at in the team report, that this project ran in parallel with a similar hobby project I was doing with some friends. At least, similar regarding my specific tasks.
|
||||||
|
// However, the skills I was developing there directly benefited my work here, and vice versa.
|
||||||
|
|
||||||
|
= Role in the Team
|
||||||
|
|
||||||
|
My primary role was to set up the server, and develop the APIs for the database and cloud data management.
|
||||||
|
|
||||||
|
It also became apparent early on that I'd naturally take on a broader technical role. We decided at the beginning to establish clear Git rules to work efficiently. I was responsible for writing these "Guidelines & Unified Laws for Advanced Gitflow" (GULAG) and making sure everyone respected them. It quickly turned out that I also had to do most of the code reviews. This was quite time-consuming but very formative, especially since we all came into this project with different backgrounds and coding approaches.
|
||||||
|
|
||||||
|
Beyond doing most of the reviews, I also ended up helping my teammates with debugging and code design. I became the team's troubleshooter.
|
||||||
|
|
||||||
|
I was basically the person picking up all the tasks we forgot to plan for at the beginning. I didn't mind this role at all; I like helping out and sharing my knowledge.
|
||||||
|
|
||||||
|
= Objective & skills review
|
||||||
|
|
||||||
|
My initial objective was to #quote(strike[Solve Maxwell's equations])
|
||||||
|
#par(text(size: 0.8em, emph[
|
||||||
|
A data infrastructure is automated, deployed both in productive and development environment. The database is automatically configured and populated by external MeteoSwiss data.
|
||||||
|
The student didn't experiment automatic deploy /configuration and multi-environment.
|
||||||
|
]))
|
||||||
|
|
||||||
|
This objective was partially completed and shifted during the project. I did successfully deploy a server infrastructure with a database and a broker, including the corresponding APIs to push and retrieve data. However, the MeteoSwiss data integration was abandoned because it fell out of scope after one student left the group.
|
||||||
|
The database is indeed automatically configured. I didn't focus on setting up automatic deployment for my part. Another student ended up doing automatic deployment on the project.
|
||||||
|
|
||||||
|
I still learned a lot on this project overall. It wasn't really what I expected technically, but I gained much more experience in technical project management and figuring out how to work with people from very different backgrounds and horizons. I became much more versatile during this project, which, I think, is essential for an engineer. We should all be able to do a bit of everything and communicate with anyone.
|
||||||
44
ui/CHANGELOG.md
Normal file
44
ui/CHANGELOG.md
Normal file
@@ -0,0 +1,44 @@
|
|||||||
|
# Changelog
|
||||||
|
|
||||||
|
All notable changes to this project will be documented in this file.
|
||||||
|
|
||||||
|
## [unreleased]
|
||||||
|
|
||||||
|
### 🚀 Features
|
||||||
|
|
||||||
|
- *(ui)* Initialize Angular 18 dashboard project
|
||||||
|
- *(ui)* Create organized folder structure for application
|
||||||
|
- *(ui)* Configure routing with lazy-loaded components
|
||||||
|
- *(ci)* Add Docker build, push and SSH deploy pipeline *(🤖 Claude:claude-sonnet-4-6)*
|
||||||
|
- *(ui)* Implement interactive room map with REST services and unit tests
|
||||||
|
- *(ui)* Interactive room map, detail panel redesign and polling
|
||||||
|
- *(ui)* Dynamic room polling, secure credentials and CO2 levels
|
||||||
|
|
||||||
|
### 🐛 Bug Fixes
|
||||||
|
|
||||||
|
- *(ui)* Add environment.prod.ts for production builds
|
||||||
|
- *(ui)* Address code review feedback
|
||||||
|
- *(ui)* Remove hardcoded credentials and make CO2 spec config-driven
|
||||||
|
|
||||||
|
### 🚜 Refactor
|
||||||
|
|
||||||
|
- *(ui)* Simplify room names and remove dead code
|
||||||
|
|
||||||
|
### 🎨 Styling
|
||||||
|
|
||||||
|
- *(ui)* Apply Prettier formatting
|
||||||
|
- *(ui)* Apply Prettier formatting *(🤖 Claude:claude-sonnet-4-6)*
|
||||||
|
|
||||||
|
### ⚙️ Miscellaneous Tasks
|
||||||
|
|
||||||
|
- Init
|
||||||
|
- *(ui)* Setup GitHub Actions CI/CD pipeline
|
||||||
|
- *(ui)* Remove commented-out gitignore line for environment.prod.ts
|
||||||
|
- *(ui)* Add plan.svg floor plan asset
|
||||||
|
- Remove useless gitkeep file
|
||||||
|
- Add changelogs
|
||||||
|
|
||||||
|
### 🤖 AI Assistance Repartition
|
||||||
|
- **Claude:claude-sonnet-4-6**: 2 commits
|
||||||
|
|
||||||
|
<!-- generated by git-cliff -->
|
||||||
Reference in New Issue
Block a user