pmeunier/grain - Change 6NRS3ZPPZ6A42IEDMRLQ7LZ5TPPLFQ6AGYVS32TQRGHBIJQW4WBAC

Fournisseur de carte et débuggage

Created by pmeunier on May 14, 2024

6NRS3ZPPZ6A42IEDMRLQ7LZ5TPPLFQ6AGYVS32TQRGHBIJQW4WBAC

Dependencies

In channels

main

Change contents

Deletion in src/routes/projet/[id]/Description.svelte at line 9 [5.869]

B:BD[5.1022] → [5.1022:1229]


    const mapsrv =
        'https://wxs.ign.fr/essentiels/geoportail/wmts?REQUEST=GetTile&SERVICE=WMTS&VERSION=1.0.0&STYLE=normal&TILEMATRIXSET=PM&FORMAT=image/png&LAYER=GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2&'

Replacement in src/routes/projet/[id]/Description.svelte at line 45 [5.869]

B:BD[5.2277] → [5.2277:2340]

            `${mapsrv}TILEMATRIX={z}&TILEROW={y}&TILECOL={x}`,

[5.2277]

[5.2340]

            `https://tile.openstreetmap.org/{z}/{x}/{y}.png`,

Deletion in src/routes/projet/[id]/Description.svelte at line 57 [5.869]

B:BD[5.2623] → [5.2623:2731]

            // e.tile.src = `${mapsrv}TILEMATRIX=${e.coords.z}&TILEROW=${e.coords.y}&TILECOL=${e.coords.x}`

Replacement in src/routes/projet/[id]/+page.svelte at line 22 [8.804604]

∅:D[6.3005] → [7.59746:59876]

∅:D[5.5278] → [7.59746:59876]

B:BD[9.4451] → [7.59746:59876]

B:BD[7.59876] → [6.3006:3042]

∅:D[6.3042] → [7.59876:60017]

∅:D[5.5305] → [7.59876:60017]

B:BD[7.59876] → [7.59876:60017]

    export let data: {
        nom: string
        porteur: string
        adresse: string
        tel: string
        id: string
        centrales: Grain.Centrale[]
        img?: string
        simulation: Grain.SimulationCommunaute
        guest?: boolean
        prms: Prm[]
        email?: string
    }

[6.3005]

[8.805016]

        export let data: {
            nom: string
            porteur: string
            adresse: string
            tel: string
            id: string
            centrales: Grain.Centrale[]
            img?: string
            simulation: Grain.SimulationCommunaute
            guest?: boolean
            prms: Prm[]
            email?: string
        }

Replacement in src/routes/projet/[id]/+page.svelte at line 138 [8.804604]
∅:D[5.5508] → [7.62723:62763]
B:BD[7.62723] → [7.62723:62763]
```
            ? 'active'
            : ''
```
[5.5508]
[8.805588]
```
        ? 'active'
        : ''
```

Replacement in src/routes/projet/[id]/+page.svelte at line 166 [8.804604]

B:BD[7.63476] → [7.63476:63538]

        ? p.puissance * 1000 * p.ratio + p.enedis
        : 0

[7.63476]

[8.806262]

                      ? p.puissance * 1000 * p.ratio + p.enedis
                      : 0

Replacement in src/routes/projet/[id]/+page.svelte at line 172 [8.804604]

B:BD[7.63620] → [7.63620:63775]

        p.puissance <= 36
            ? 0.21 * 1000 * p.puissance
            : p.puissance <= 100
            ? 0.11 * 1000 * p.puissance
            : 0

[7.63620]

[8.806460]

        (p.puissance <= 3 ? 0.30
        :p.puissance <= 9 ? 0.23
        :p.puissance <= 36 ? 0.20
       : p.puissance <= 100 ? 0.10
       : 0) * 1000 * p.puissance

Replacement in src/routes/projet/[id]/+page.svelte at line 180 [8.804604]
B:BD[8.806567] → [2.0:28]
```
    const surface_kwc = 2.5
```
[8.806567]
[7.63873]
```
    let surface_kwc = 4.5
```

Insertion in src/routes/projet/[id]/+page.svelte at line 196 [8.804604]

[10.3827]

[7.64075]

    function onRatioChange(ev: Event) {
        surface_kwc = (ev.target as HTMLInputElement).valueAsNumber
        surface = p.puissance * surface_kwc
    }

Replacement in src/routes/projet/[id]/+page.svelte at line 217 [8.804604]

B:BD[7.64621] → [7.64621:64797]

        productionAnnuelle(i) *
            (autoconso * tarifLocal(i) +
                (1 - autoconso) * tarifSurplus(i) +
                (p.autoprod * tarifAllo(i)) / 100)

[7.64621]

[8.806946]

                                      productionAnnuelle(i) *
    (autoconso * tarifLocal(i) +
                 (1 - autoconso) * tarifSurplus(i) +
                 (p.autoprod * tarifAllo(i)) / 100)

Replacement in src/routes/projet/[id]/+page.svelte at line 227 [8.804604]

B:BD[7.64972] → [7.64972:65089]

            (1 - autoconso) * productionAnnuelle(i) * p.turpeInjection) *
        Math.pow(1 + p.inflation / 100, i)

[7.64972]

[8.807190]

             (1 - autoconso) * productionAnnuelle(i) * p.turpeInjection) *
    Math.pow(1 + p.inflation / 100, i)

Replacement in src/routes/projet/[id]/+page.svelte at line 232 [8.804604]
B:BD[7.65173] → [7.65173:65216]
```
        Math.pow(1 + p.inflation / 100, i)
```
[7.65173]
[8.807292]
```
    Math.pow(1 + p.inflation / 100, i)
```

Replacement in src/routes/projet/[id]/+page.svelte at line 239 [8.804604]

B:BD[7.65406] → [7.65406:65492]

        exploitation(i) +
        turpe(i) +
        assurance(i) +
        divers(i)

[7.65406]

[8.807512]

                              exploitation(i) +
                              turpe(i) +
                              assurance(i) +
                              divers(i)

Replacement in src/routes/projet/[id]/+page.svelte at line 273 [8.804604]
B:BD[7.66487] → [7.66487:66498]
```
        10
```
[7.66487]
[8.808032]
```
    10
```

Replacement in src/routes/projet/[id]/+page.svelte at line 292 [8.804604]

B:BD[7.67090] → [7.67090:67179]

            ? tresorerieDisponibleDetteSenior(i) / serviceDetteSenior(i)
            : 0

[7.67090]

[8.808710]

          ? tresorerieDisponibleDetteSenior(i) / serviceDetteSenior(i)
          : 0

Replacement in src/routes/projet/[id]/+page.svelte at line 297 [8.804604]

B:BD[7.67236] → [7.67236:67352]

        amortissement(i) -
        provisionOnduleurs(i) -
        interetsDetteSenior(i) -
        interetsDSRA(i)

[7.67236]

[9.5430]

                                     amortissement(i) -
                                     provisionOnduleurs(i) -
                                     interetsDetteSenior(i) -
                                     interetsDSRA(i)

Replacement in src/routes/projet/[id]/+page.svelte at line 328 [8.804604]

B:BD[7.68059] → [7.68059:68153]

                Math.pow(1 + p.inflationElec / 100, i) *
                consoMoyenneFoyer(i)

[7.68059]

[7.68153]

            Math.pow(1 + p.inflationElec / 100, i) *
            consoMoyenneFoyer(i)

Replacement in src/routes/projet/[id]/+page.svelte at line 339 [8.804604]

B:BD[7.68375] → [7.68375:68575]

                (p.coutElec *
                    Math.pow(1 + p.inflationElec / 100, i) *
                    consoMoyenneFoyer(i) *
                    (100 - p.autoprod)) /
                    100

[7.68375]

[7.68575]

                 (p.coutElec *
                     Math.pow(1 + p.inflationElec / 100, i) *
                     consoMoyenneFoyer(i) *
                     (100 - p.autoprod)) /
            100

Replacement in src/routes/projet/[id]/+page.svelte at line 377 [8.804604]
B:BD[7.69353] → [4.399:424]
```
            fmt2.format(
```
[7.69353]
[7.69380]
```
            fmt0.format(
```
Replacement in src/routes/projet/[id]/+page.svelte at line 433 [8.804604]
B:BD[7.70879] → [4.425:453]
```
        return fmt2.format(
```
[7.70879]
[7.70909]
```
        return fmt0 .format(
```

Replacement in src/routes/projet/[id]/+page.svelte at line 435 [8.804604]

B:BD[7.70952] → [7.70952:71092]

                ? ((totalRembAnnuel_n + totalInteret_n) * 100) /
                      (totalRembAnnuel + totalInteret)
                : 0

[7.70952]

[7.71092]

            ? ((totalRembAnnuel_n + totalInteret_n) * 100) /
            (totalRembAnnuel + totalInteret)
            : 0

Replacement in src/routes/projet/[id]/+page.svelte at line 465 [8.804604]

B:BD[7.71524] → [7.71524:71581]

            class="offcanvas-lg offcanvas-start mb-auto"

[7.71524]

[7.71581]

            class="offcanvas-lg offcanvas-start mb-auto offmenu"

Replacement in src/routes/projet/[id]/+page.svelte at line 480 [8.804604]

B:BD[7.71838] → [7.71838:71878]

                            id="expert"

[7.71838]

[7.71878]

                            id="expertsw"

Replacement in src/routes/projet/[id]/+page.svelte at line 482 [8.804604]

B:BD[7.71931] → [7.71931:72000]

                        <label class="form-check-label" for="expert"

[7.71931]

[7.72000]

                        <label class="form-check-label" for="expertsw"

Replacement in src/routes/projet/[id]/+page.svelte at line 488 [8.804604]

B:BD[7.72118] → [11.1207:1267]

                            >Puissance totale (kWc)</label>

[7.72118]

[7.72178]

                        >Puissance totale (kWc)</label>

Replacement in src/routes/projet/[id]/+page.svelte at line 498 [8.804604]

B:BD[11.1344] → [11.1344:1730]

                                <i
                                    class="bi bi-exclamation-circle-fill me-2" />&nbsp;Une
                                communauté d'autoconsommation ne peut dépasser
                                plus de 3MWc. Les résultats obtenus seront donc
                                purement hypothétiques.</span
                            >{/if}

[11.1344]

[10.9734]

                            <i
                                class="bi bi-exclamation-circle-fill me-2" />&nbsp;Une
                            communauté d'autoconsommation ne peut dépasser
                            plus de 3MWc. Les résultats obtenus seront donc
                            purement hypothétiques.</span
                                                   >{/if}

Replacement in src/routes/projet/[id]/+page.svelte at line 506 [8.804604]

B:BD[10.9800] → [7.72505:72629]

                        <label class="form-label" for="puissance"
                            >Surface totale (m²)</label>

[10.9800]

[7.72629]

                        <label class="form-label" for="surface"
                        >Surface totale (m²)<button
                                                type="button"
                                                class="btn btn-link align-baseline p-0 ms-2"
                                                data-bs-toggle="popover"
                                                data-bs-trigger="hover focus"
                                                data-bs-content="Estimation de la surface de modules photovoltaïques en fonction de la puissance et du ratio (configurable en mode expert)."
                                            ><i class="bi bi-question-circle" /></button></label>

Replacement in src/routes/projet/[id]/+page.svelte at line 524 [8.804604]

B:BD[7.73014] → [7.73014:73604]

                            >Taux d'autoconsommation (%)<button
                                type="button"
                                class="btn btn-link align-baseline p-0 ms-2"
                                data-bs-toggle="popover"
                                data-bs-trigger="hover focus"
                                data-bs-content="Pourcentage de la production consommée localement, à valider plus finement dans l'onglet Simulation. C'est la valeur que l'application Coturnix optimise."
                                ><i class="bi bi-question-circle" /></button>

[7.73014]

[12.5507]

                        >Taux d'autoconsommation (%)<button
                                                        type="button"
                                                        class="btn btn-link align-baseline p-0 ms-2"
                                                        data-bs-toggle="popover"
                                                        data-bs-trigger="hover focus"
                                                        data-bs-content="Pourcentage de la production consommée localement, à valider plus finement dans l'onglet Simulation. C'est la valeur que l'application Coturnix optimise."
                                                    ><i class="bi bi-question-circle" /></button>

Replacement in src/routes/projet/[id]/+page.svelte at line 565 [8.804604]

B:BD[7.75135] → [7.75135:75257]

                                data-bs-content="Ce prix dépend du contrat de fourniture d'électricité du producteur."

[7.75135]

[7.75257]

                                data-bs-content="Prix d'achat moyen des consommateurs de la communauté à leur fournisseur d'électricité habituel (par exemple EDF)."

Replacement in src/routes/projet/[id]/+page.svelte at line 583 [8.804604]

B:BD[7.76053] → [7.76053:76205]

                                data-bs-content="Dans Coturnix, chaque producteur choisit son prix, et Coturnix propose le moins cher au consommateur."

[7.76053]

[7.76205]

                                data-bs-content="Hypothèse sur le prix de vente moyen. Dans Coturnix, les producteurs et les consommateurs choisissent leurs prix acceptables, et Coturnix calcule à chaque instant le prix qui maximise la valeur totale créée par la communauté."

Deletion in src/routes/projet/[id]/+page.svelte at line 593 [8.804604]

∅:D[7.76623] → [12.7535:7601]

B:BD[12.7535] → [12.7535:7601]

B:BD[12.7601] → [7.76624:77055]

                    </div>
                    <div class="mb-3">
                        <label class="form-label" for="inflationElec"
                            >Inflation nationale de l'électricité (%)</label>
                        <input
                            class="form-control form-control-sm"
                            type="number"
                            bind:value={p.inflationElec}
                            min="0"
                            id="inflationElec" />

Replacement in src/routes/projet/[id]/+page.svelte at line 768 [8.804604]

B:BD[13.3253] → [7.82259:82335]

∅:D[7.82335] → [13.3254:3329]

B:BD[12.12760] → [13.3254:3329]

                            <div class="d-flex justify-content-around p-5">
                                <div class="me-3 flex-column text-center">

[13.3253]

[7.82336]

                            <div class="d-flex justify-content-between p-5">
                                <div class="flex-column text-center">
                                    <div class="donnee">
                                        {format(investissement)}
                                    </div>
                                    <div>Montant de l'investissement</div>
                                </div>
                                <div class="mx-3 flex-column text-center">

Replacement in src/routes/projet/[id]/+page.svelte at line 781 [8.804604]

B:BD[12.13076] → [13.3404:3479]

                                <div class="ms-3 flex-column text-center">

[12.13076]

[14.10298]

                                <div class="flex-column text-center">

Replacement in src/routes/projet/[id]/+page.svelte at line 918 [8.804604]

∅:D[7.88154] → [12.17454:17531]

B:BD[12.17454] → [12.17454:17531]

                                    <div class="donnee">{rembPret(10)}</div>

[7.88154]

[7.88155]

                                    <div class="donnee">{rembPret(10)}%</div>

Replacement in src/routes/projet/[id]/+page.svelte at line 963 [8.804604]

∅:D[13.5551] → [12.19330:19406]

B:BD[12.19330] → [12.19330:19406]

                                    <div class="donnee">{rembPret(5)}</div>

[13.5551]

[7.89282]

                                    <div class="donnee">{rembPret(5)}%</div>

Replacement in src/routes/projet/[id]/+page.svelte at line 1110 [8.804604]

B:BD[7.94079] → [7.94079:94148]

                                    <div class="tcellt">&nbsp;</div>

[7.94079]

[7.94148]

                                    <div class="tcellt">{#if i == 0}{primeInvestissement}{:else}&nbsp;{/if}</div>

Replacement in src/routes/projet/[id]/+page.svelte at line 1218 [8.804604]

B:BD[13.13085] → [13.13085:13164]

                                <div class="titreligne tcellt">Onduleurs</div>

[13.13085]

[7.98325]

                                <div class="titreligne tcellt">Onduleurs
                                    <button
                                        type="button"
                                        class="btn btn-sm btn-link align-baseline p-0 ms-2"
                                        data-bs-toggle="popover"
                                        data-bs-trigger="hover focus"
                                        data-bs-content="Provision pour le remplacement des onduleurs"
                                    ><i class="bi bi-question-circle" /></button>
                                </div>

Replacement in src/routes/projet/[id]/+page.svelte at line 1234 [8.804604]

B:BD[7.98705] → [7.98705:98757]

                                    Intérêts DSRA

[7.98705]

[7.98757]

                                    Intérêts DSRA <button
                                                      type="button"
                                                      class="btn btn-link align-baseline p-0 ms-2"
                                                      data-bs-toggle="popover"
                                                      data-bs-trigger="hover focus"
                                                      data-bs-content="Dans un emprunt, compte bancaire qui permettra de payer le service de la dette si jamais l'entité emprunteuse n'est plus en mesure de le faire."
                                                  ><i class="bi bi-question-circle" /></button>

Replacement in src/routes/projet/[id]/+page.svelte at line 1337 [8.804604]

B:BD[7.102308] → [7.102308:102387]

                        class="tab-pane fade {expertActive} {expertShow} py-3"

[7.102308]

[7.102387]

                        class="tab-pane fade {expertActive} {expertShow} p-3"

Replacement in src/routes/projet/[id]/+page.svelte at line 1367 [8.804604]

B:BD[7.103571] → [7.103571:103643]

                                    >Ratio installation (€/W)</label>

[7.103571]

[7.103643]

                                >Ratio installation (€/W)</label>

Replacement in src/routes/projet/[id]/+page.svelte at line 1378 [8.804604]

B:BD[7.104033] → [7.104033:104105]

                                    >Taux de dégradation PV(%)</label>

[7.104033]

[7.104105]

                                >Taux de dégradation PV(%)</label>

Insertion in src/routes/projet/[id]/+page.svelte at line 1385 [8.804604]

[7.104430]

[15.5207]

                            </div>
                            <div class="mb-3">
                                <label class="form-label" for="dsra"
                                >Taux d'intérêt DSRA (%)</label>
                                <input
                                    class="form-control form-control-sm"
                                    type="number"
                                    id="dsra"
                                    min="0"
                                    step="any"
                                    bind:value={p.tauxDSRA} />

Replacement in src/routes/projet/[id]/+page.svelte at line 1401 [8.804604]

B:BD[7.104505] → [7.104505:104572]

                                    >Inflation tarif local</label>

[7.104505]

[7.104572]

                                >Inflation tarif local</label>

Insertion in src/routes/projet/[id]/+page.svelte at line 1408 [8.804604]

[7.104893]

[16.40652]

                            </div>
                            <div class="mb-3">
                                <label class="form-label" for="inflationElec"
                                >Inflation nationale de l'électricité (%)</label>
                                <input
                                    class="form-control form-control-sm"
                                    type="number"
                                    bind:value={p.inflationElec}
                                    min="0"
                                    id="inflationElec" />

Insertion in src/routes/projet/[id]/+page.svelte at line 1419 [8.804604]

[16.40687]

[12.37491]


                            <div class="my-3">
                                <label class="form-label" for="surfacekwc">Surface d'un kWc (m²)</label>
                                <input
                                    class="form-control form-control-sm"
                                    type="number"
                                    id="surfacekwc"
                                    step ="any"
                                    value={surface_kwc}
                                    on:change={onRatioChange} />
                            </div>

Insertion in src/routes/projet/[id]/+page.svelte at line 1543 [8.804604]
[3.52]
[3.52]
```
    .offmenu {
        padding-top: 40px;
    }
```

Replacement in src/routes/+layout.svelte at line 18 [8.856748]

B:BD[7.134742] → [11.2803:2850]

                                >À propos</a>

[7.134742]

[17.2969]

                            >À propos</a>

Replacement in src/routes/+layout.svelte at line 24 [8.856748]

B:BD[11.2983] → [11.2983:3043]

                                >Je lance ma simulation</a>

[11.2983]

[18.14723]

                            >Je lance ma simulation</a>

Replacement in src/grain-types.ts at line 55 [8.859511]

B:BD[8.860971] → [8.860971:861019]

                prix: [0.1339, 0.0803, 0.1312],

[8.860971]

[14.16130]

                prix: [0.1301, 0.781, 0.1141],